summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--HISTORY42
-rw-r--r--MCONFIG17
-rw-r--r--VERSION2
-rwxr-xr-xconfigure112
-rw-r--r--disk-utils/Makefile11
-rw-r--r--disk-utils/cramfs.h81
-rw-r--r--disk-utils/fdformat.c9
-rw-r--r--disk-utils/fsck.cramfs.c625
-rw-r--r--disk-utils/mkfs.83
-rw-r--r--disk-utils/mkfs.cramfs.c828
-rw-r--r--fdisk/cfdisk.81
-rw-r--r--fdisk/fdisk.81
-rw-r--r--fdisk/fdisk.c97
-rw-r--r--fdisk/fdiskbsdlabel.c246
-rw-r--r--fdisk/fdiskbsdlabel.h4
-rw-r--r--fdisk/fdisksunlabel.c4
-rw-r--r--fdisk/partname.c5
-rw-r--r--fdisk/sfdisk.81
-rw-r--r--fdisk/sfdisk.c6
-rw-r--r--hwclock/Makefile4
-rw-r--r--hwclock/README.aeb9
-rw-r--r--hwclock/README.shhopt-1.1155
-rw-r--r--hwclock/adjtime.patch302
-rw-r--r--hwclock/cmos.c34
-rw-r--r--hwclock/hwclock.83
-rw-r--r--hwclock/hwclock.c718
-rw-r--r--hwclock/kd.c3
-rw-r--r--hwclock/rtc.c38
-rw-r--r--hwclock/shhopt-1.1.lsm17
-rw-r--r--hwclock/shhopt.c468
-rw-r--r--hwclock/shhopt.h33
-rw-r--r--lib/nls.h2
-rw-r--r--lib/pathnames.h2
-rw-r--r--lib/widechar.h2
-rw-r--r--mount/Makefile16
-rw-r--r--mount/fstab.c2
-rw-r--r--mount/linux_fs.h55
-rw-r--r--mount/mount.813
-rw-r--r--mount/mount.c436
-rw-r--r--mount/mount_by_label.c30
-rw-r--r--mount/mount_constants.h4
-rw-r--r--mount/mount_guess_fstype.c5
-rw-r--r--mount/nfs.56
-rw-r--r--mount/pivot_root.c20
-rw-r--r--mount/sundries.h1
-rw-r--r--mount/swapon.818
-rw-r--r--mount/swapon.c494
-rw-r--r--partx/gpt.c4
-rw-r--r--po/Makefile11
-rw-r--r--po/POTFILES.in4
-rw-r--r--po/cat-id-tbl.c2808
-rw-r--r--po/cs.po1584
-rw-r--r--po/da.po1584
-rw-r--r--po/de.po1739
-rw-r--r--po/es.po1625
-rw-r--r--po/et.po1849
-rw-r--r--po/fr.po1629
-rw-r--r--po/it.po1588
-rw-r--r--po/ja.po1586
-rw-r--r--po/nl.po1541
-rw-r--r--po/pt_BR.po1586
-rw-r--r--po/sv.po1593
-rw-r--r--po/tr.po1592
-rw-r--r--sys-utils/ipcrm.8109
-rw-r--r--sys-utils/ipcs.c8
-rw-r--r--text-utils/LICENSE.pg28
-rw-r--r--text-utils/Makefile31
-rw-r--r--text-utils/README.pg23
-rw-r--r--text-utils/column.c31
-rw-r--r--text-utils/line.129
-rw-r--r--text-utils/line.c38
-rw-r--r--text-utils/line.sh22
-rw-r--r--text-utils/more.c15
-rw-r--r--text-utils/pg.1238
-rw-r--r--text-utils/pg.c1775
75 files changed, 18460 insertions, 11195 deletions
diff --git a/HISTORY b/HISTORY
index 8fed606bc..fc69018b7 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,3 +1,45 @@
+util-linux 2.11t
+
+* fdformat: remove test on major
+* fsck.cramfs: added NLS
+* fdisk: fix device names with sundisklabels under devfs (Kaj-Michael Lang)
+* fdisk: minor polishing
+* hwclock: also handle ENOTTY ioctl return (Maciej W. Rozycki)
+* hwclock: minor polishing
+* ipcrm.8: minor polishing
+* mkfs.cramfs: added NLS
+* mkfs.cramfs: added -v (verbose) option, and made default silent
+* mount: patch for make -j (RedHat)
+* swapoff: minor polishing
+
+util-linux 2.11s
+
+* Estonian messages (Meelis Roos)
+* French messages: some minor corrections
+* No French messages with permission to distribute (Michel Robitaille)
+* German messages (Michael Piefel)
+* Spanish messages (Santiago Vila Doncel)
+* Swedish messages (Christian Rose)
+* Turkish messages (Nilgün Belma Bugüner)
+* MCONFIG: allow "make DISABLE_NLS=yes <target>" (Peter Breitenlohner)
+* configure: don't run ./conftest - better for cross-compilation (Magnus Damm)
+* fdisk: fixes for disks with OSF/1 label
+* fsck.cramfs: new (from kernel source)
+* hwclock: improved adjtime handling (James P. Rutledge)
+* hwclock: remove shhopts stuff
+* ipcs: remove unused heading (Michael Kerrisk)
+* line: replace by C version - the sh version was broken (Gunnar Ritter)
+* login: default root path: added /usr/local/[s]bin (RedHat)
+* mkfs.cramfs: new (from kernel source)
+* mount: when no type is known, assume that prefix // implies samba (RedHat)
+* mount -a: avoid stat on devices that have noauto option (Jeroen Mostert)
+* mount by label: ignore RAID partitions (RedHat)
+* [u]mount: fstab.c fix (ejb@ql.org)
+* pg: new (Gunnar Ritter)
+* sfdisk: small BSD partition fix
+* swapoff -a: also do swapoff on all files found in /proc/swaps
+* swapon -a: skip files already found in /proc/swaps
+
util-linux 2.11r
* Estonian messages (Meelis Roos)
diff --git a/MCONFIG b/MCONFIG
index e09ec2af0..7f7ad581b 100644
--- a/MCONFIG
+++ b/MCONFIG
@@ -93,6 +93,15 @@ HAVE_SLN=no
# If HAVE_FDUTILS is set to "yes", then setfdprm won't be installed.
HAVE_FDUTILS=no
+# If SILENT_PG is set to "yes", then pg will not ring the bell
+# when an invalid key is pressed
+SILENT_PG=no
+
+# If configure decides that Native Language Support (NLS) is available,
+# it sets MAY_ENABLE_NLS in defines.h. If you don't want NLS, set
+# DISABLE_NLS to "yes".
+DISABLE_NLS=no
+
# Different optimizations for different cpus.
# gcc 3.0 likes options -mcpu=i486 instead of -m486
ifeq "$(ARCH)" "intel"
@@ -198,8 +207,12 @@ INSTALLMAN= $(INSTALL) -m $(MANMODE)
INSTALLDAT= $(INSTALL) -m $(DATMODE)
INSTALLSUID= $(INSTALL) -m $(SUIDMODE) -o root
-CFLAGS := $(OPT) -I$(LIB) $(WARNFLAGS) \
- $(CURSESFLAGS) $(SLANGFLAGS) \
+ifeq "$(DISABLE_NLS)" "yes"
+NLSFLAGS = -DDISABLE_NLS
+endif
+
+CFLAGS := $(OPT) -I$(LIB) $(WARNFLAGS) \
+ $(CURSESFLAGS) $(SLANGFLAGS) $(NLSFLAGS) \
-D_FILE_OFFSET_BITS=64 \
-DSBINDIR=\"$(SBIN_DIR)\" \
-DUSRSBINDIR=\"$(USRSBIN_DIR)\" \
diff --git a/VERSION b/VERSION
index cb5cbc12c..af8c274d0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.11r
+2.11t
diff --git a/configure b/configure
index 45d567b69..a2f533cc6 100755
--- a/configure
+++ b/configure
@@ -23,6 +23,8 @@
# F4. For hwclock/kd.c: do we have nanosleep()?
# F5. For mkswap.c: do we have personality()?
# F6. For agetty.c: is updwtmp() available?
+# F7. For pg.c: are fseeko() and ftello() available?
+# F8. For fsck.cramfs.c: is lchown() available?
#
# 1. For sys-utils/cytune.c: do we need <linux/tqueue.h>?
# 2. For cfdisk, setterm, more, ul: do we have ncurses? How installed?
@@ -59,6 +61,7 @@ echo LDFLAGS=$LDFLAGS >> make_include
DEFS=
LIBS=
compile='$CC $CFLAGS $DEFS conftest.c -o conftest $LIBS >/dev/null 2>&1'
+compile_with_warnings='$CC $CFLAGS $DEFS conftest.c -o conftest $LIBS 2>&1'
static_compile='$CC -static $DEFS conftest.c -o conftest $LIBS >/dev/null 2>&1'
eval COMPILE='"'$compile'"'
export COMPILE
@@ -70,7 +73,7 @@ rm -f conftest.c conftest
# `-m486' is deprecated. Use `-march=i486' or `-mcpu=i486' instead.
#
echo "
-main(){ exit(0); }
+int main(){ exit(0); }
" > conftest.c
gccout=`$CC $CFLAGS -m386 conftest.c -o conftest 2>&1 | grep "march="`
if test -z "$gccout"; then
@@ -91,10 +94,10 @@ echo "
#define u_char unsigned char
#include <scsi/scsi.h>
#undef u_char
-main(){ exit(0); }
+int main(){ exit(0); }
" > conftest.c
eval $compile
-if test -s conftest && ./conftest 2>/dev/null; then
+if test -s conftest; then
echo "#define HAVE_scsi_h" >> defines.h
echo "You have <scsi/scsi.h>"
else
@@ -172,14 +175,14 @@ echo "
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-main(int a, char **v){
+int main(int a, char **v){
if (a == -1) /* false */
inet_aton((const char *) 0, (struct in_addr *) 0);
exit(0);
}
" > conftest.c
eval $compile
-if test -s conftest && ./conftest 2>/dev/null; then
+if test -s conftest; then
echo "#define HAVE_inet_aton" >> defines.h
echo "You have inet_aton()"
else
@@ -192,14 +195,14 @@ rm -f conftest conftest.c
#
echo "
#include <unistd.h>
-main(int a, char **v){
+int main(int a, char **v){
if (a == -1) /* false */
fsync(0);
exit(0);
}
" > conftest.c
eval $compile
-if test -s conftest && ./conftest 2>/dev/null; then
+if test -s conftest; then
echo "#define HAVE_fsync" >> defines.h
echo "You have fsync()"
else
@@ -212,7 +215,7 @@ rm -f conftest conftest.c
#
echo "
#include <unistd.h>
-main(int a, char **v){
+int main(int a, char **v){
char buf[1];
if (a == -1) /* false */
getdomainname(buf, sizeof buf);
@@ -220,7 +223,7 @@ main(int a, char **v){
}
" > conftest.c
eval $compile
-if test -s conftest && ./conftest 2>/dev/null; then
+if test -s conftest; then
echo "#define HAVE_getdomainname" >> defines.h
echo "You have getdomainname()"
else
@@ -240,7 +243,7 @@ int main () {
}
" > conftest.c
eval $compile
-if test -s conftest && ./conftest 2>/dev/null; then
+if test -s conftest; then
echo "#define HAVE_nanosleep" >> defines.h
echo "You have nanosleep()"
else
@@ -259,7 +262,7 @@ int main () {
}
" > conftest.c
eval $compile
-if test -s conftest && ./conftest 2>/dev/null; then
+if test -s conftest; then
echo "#define HAVE_personality" >> defines.h
echo "You have personality()"
else
@@ -273,7 +276,7 @@ rm -f conftest conftest.c
echo '
#include <string.h>
#include <utmp.h>
-main(int a, char **v){
+int main(int a, char **v){
struct utmp ut;
memset (&ut, 0, sizeof(ut));
if (a == -1) /* false */
@@ -282,7 +285,7 @@ main(int a, char **v){
}
' > conftest.c
eval $compile
-if test -s conftest && ./conftest 2>/dev/null; then
+if test -s conftest; then
echo "#define HAVE_updwtmp" >> defines.h
echo "You have updwtmp()"
else
@@ -290,6 +293,45 @@ else
fi
rm -f conftest conftest.c
+#
+# F7. For pg.c: are fseeko() and ftello() available?
+#
+echo '
+#include <stdio.h>
+int main(int a, char **v){
+ fseeko(stdout, 0, 0);
+ ftello(stdout);
+ exit(0);
+}
+' > conftest.c
+eval $compile
+if test -s conftest; then
+ echo "#define HAVE_fseeko" >> defines.h
+ echo "You have fseeko()"
+else
+ echo "You don't have fseeko()"
+fi
+rm -f conftest conftest.c
+
+#
+# F8. For fsck.cramfs.c: is lchown() available?
+#
+echo '
+#include <sys/types.h>
+#include <unistd.h>
+int main(int a, char **v){
+ lchown("nowhere",0,0);
+ exit(0);
+}
+' > conftest.c
+gccout=`eval $compile_with_warnings | grep "lchown is not implemented"`
+if test -s conftest -a -z "$gccout"; then
+ echo "#define HAVE_lchown" >> defines.h
+ echo "You have lchown()"
+else
+ echo "You don't have lchown()"
+fi
+rm -f conftest conftest.c
#
# 1. cytune.c may need struct tq_struct
@@ -297,10 +339,10 @@ rm -f conftest conftest.c
echo "
#include <sys/types.h>
#include <linux/cyclades.h>
-main(){ exit(0); }
+int main(){ exit(0); }
" > conftest.c
eval $compile
-if test -s conftest && ./conftest 2>/dev/null; then
+if test -s conftest; then
echo "You don't need <linux/tqueue.h>"
else
echo "#define NEED_tqueue_h" >> defines.h
@@ -339,10 +381,10 @@ fi
if [ $test_curses_h = 1 ]; then
echo "
#include <curses.h>
- main(){ char *c = NCURSES_VERSION; exit(0); }
+ int main(){ char *c = NCURSES_VERSION; exit(0); }
" > conftest.c
eval $compile
- if test -s conftest && ./conftest 2>/dev/null; then
+ if test -s conftest; then
echo "HAVE_NCURSES=yes" >> make_include
echo "CURSESFLAGS=-DNCH=0" >> make_include
echo "You have ncurses. Using <curses.h>."
@@ -366,12 +408,12 @@ fi
#
echo '
#include <termcap.h>
-main(){ exit(0); tgetnum("li"); }
+int main(){ exit(0); tgetnum("li"); }
' > conftest.c
LIBS=-ltermcap
eval $compile
LIBS=
-if test -s conftest && ./conftest 2>/dev/null; then
+if test -s conftest; then
echo "#define HAVE_termcap" >> defines.h
echo "HAVE_TERMCAP=yes" >> make_include
echo "LIBTERMCAP=-ltermcap" >> make_include
@@ -392,10 +434,10 @@ rm -f conftest conftest.c
echo '
#define _XOPEN_SOURCE
#include <unistd.h>
-main(){ char *c = crypt("abc","pw"); exit(0); }
+int main(){ char *c = crypt("abc","pw"); exit(0); }
' > conftest.c
eval $compile
-if test -s conftest && ./conftest 2>/dev/null; then
+if test -s conftest; then
echo "NEED_LIBCRYPT=no" >> make_include
echo "You don't need -lcrypt"
else
@@ -408,10 +450,10 @@ rm -f conftest conftest.c
# 5. Does static compilation work?
#
echo "
-main(){ return 0; }
+int main(){ return 0; }
" > conftest.c
eval $static_compile
-if test -s conftest && ./conftest 2>/dev/null; then
+if test -s conftest; then
: OK, nothing special
else
echo "CAN_DO_STATIC=no" >> make_include
@@ -424,23 +466,21 @@ rm -f conftest.c conftest
#
echo '
#include <libintl.h>
-main(int a, char **v){
+int main(int a, char **v){
if (a == -1) /* false */
gettext("There is no gettext man page\n");
exit(0);
}
' > conftest.c
eval $compile
-if test -s conftest && ./conftest 2>/dev/null; then
+if test -s conftest; then
echo '#define HAVE_libintl_h' >> defines.h
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 and remove the line with ENABLE_NLS)"
- ENABLE_NLS=yes
+ echo '#define MAY_ENABLE_NLS' >> defines.h
+ MAY_ENABLE_NLS=yes
else
- echo "You don't have <libintl.h>"
- ENABLE_NLS=no
+ echo "You don't have native language support"
+ MAY_ENABLE_NLS=no
fi
rm -f conftest conftest.c
@@ -453,7 +493,7 @@ rm -f conftest conftest.c
# Many Linux systems do not have "which". Maybe "env" can be used.
# Writing /usr/bin/xgettext is no good: one may have xgettext elsewhere.
#
-if (test $ENABLE_NLS = yes && type xgettext > /dev/null 2>&1); then
+if (test $MAY_ENABLE_NLS = yes && type xgettext > /dev/null 2>&1); then
msg=`xgettext --foreign-user 2>&1 | grep unrecognized`
if test -n "$msg"; then
echo "FOREIGN = " >> make_include
@@ -473,10 +513,10 @@ fi
echo "
#include <stdio.h>
extern char *__progname;
-main(){ printf(__progname); exit(0); }
+int main(){ printf(__progname); exit(0); }
" > conftest.c
eval $compile
-if test -s conftest && ./conftest > /dev/null 2>/dev/null; then
+if test -s conftest; then
echo "#define HAVE_progname" >> defines.h
echo "You have __progname"
else
@@ -489,12 +529,12 @@ rm -f conftest conftest.c
#
echo "
#include <pty.h>
-main(){ exit(0); openpty(0, 0, 0, 0, 0); }
+int main(){ exit(0); openpty(0, 0, 0, 0, 0); }
" > conftest.c
LIBS=-lutil
eval $compile
LIBS=
-if test -s conftest && ./conftest 2>/dev/null; then
+if test -s conftest; then
echo "HAVE_OPENPTY=yes" >> make_include
echo "#define HAVE_openpty" >> defines.h
echo "You have <pty.h> and openpty()"
diff --git a/disk-utils/Makefile b/disk-utils/Makefile
index 044a97e69..8c9543fbe 100644
--- a/disk-utils/Makefile
+++ b/disk-utils/Makefile
@@ -14,7 +14,8 @@ MAN8= blockdev.8 fdformat.8 isosize.8 mkfs.8 mkswap.8 elvtune.8 \
# Where to put binaries?
# See the "install" rule for the links. . .
-SBIN= mkfs mkswap blockdev elvtune fsck.minix mkfs.minix mkfs.bfs
+SBIN= mkfs mkswap blockdev elvtune fsck.minix mkfs.minix mkfs.bfs \
+ fsck.cramfs mkfs.cramfs
USRBIN= fdformat isosize
@@ -32,6 +33,14 @@ endif
all: $(SBIN) $(USRBIN)
+fsck.cramfs: fsck.cramfs.o
+ cc -o fsck.cramfs fsck.cramfs.o -lz
+
+mkfs.cramfs: mkfs.cramfs.o
+ cc -o mkfs.cramfs mkfs.cramfs.o -lz
+
+fsck.cramfs.o mkfs.cramfs.o: cramfs.h
+
fsck.minix.o mkfs.minix.o: bitops.h minix.h
install: all
diff --git a/disk-utils/cramfs.h b/disk-utils/cramfs.h
new file mode 100644
index 000000000..34b32ca1d
--- /dev/null
+++ b/disk-utils/cramfs.h
@@ -0,0 +1,81 @@
+#ifndef __CRAMFS_H
+#define __CRAMFS_H
+
+typedef unsigned char u8;
+typedef unsigned short u16;
+typedef unsigned int u32;
+
+#define CRAMFS_MAGIC 0x28cd3d45 /* some random number */
+#define CRAMFS_SIGNATURE "Compressed ROMFS"
+
+/*
+ * Width of various bitfields in struct cramfs_inode.
+ * Primarily used to generate warnings in mkcramfs.
+ */
+#define CRAMFS_MODE_WIDTH 16
+#define CRAMFS_UID_WIDTH 16
+#define CRAMFS_SIZE_WIDTH 24
+#define CRAMFS_GID_WIDTH 8
+#define CRAMFS_NAMELEN_WIDTH 6
+#define CRAMFS_OFFSET_WIDTH 26
+
+
+/*
+ * Reasonably terse representation of the inode data.
+ */
+struct cramfs_inode {
+ u32 mode:16, uid:16;
+ /* SIZE for device files is i_rdev */
+ u32 size:24, gid:8;
+ /* NAMELEN is the length of the file name, divided by 4 and
+ rounded up. (cramfs doesn't support hard links.) */
+ /* OFFSET: For symlinks and non-empty regular files, this
+ contains the offset (divided by 4) of the file data in
+ compressed form (starting with an array of block pointers;
+ see README). For non-empty directories it is the offset
+ (divided by 4) of the inode of the first file in that
+ directory. For anything else, offset is zero. */
+ u32 namelen:6, offset:26;
+};
+
+struct cramfs_info {
+ u32 crc;
+ u32 edition;
+ u32 blocks;
+ u32 files;
+};
+
+/*
+ * Superblock information at the beginning of the FS.
+ */
+struct cramfs_super {
+ u32 magic; /* 0x28cd3d45 - random number */
+ u32 size; /* Not used. mkcramfs currently
+ writes a constant 1<<16 here. */
+ u32 flags; /* 0 */
+ u32 future; /* 0 */
+ u8 signature[16]; /* "Compressed ROMFS" */
+ struct cramfs_info fsid;/* unique filesystem info */
+ u8 name[16]; /* user-defined name */
+ struct cramfs_inode root; /* Root inode data */
+};
+
+#define CRAMFS_FLAG_FSID_VERSION_2 0x00000001 /* fsid version #2 */
+#define CRAMFS_FLAG_SORTED_DIRS 0x00000002 /* sorted dirs */
+#define CRAMFS_FLAG_HOLES 0x00000100 /* support for holes */
+#define CRAMFS_FLAG_WRONG_SIGNATURE 0x00000200 /* reserved */
+#define CRAMFS_FLAG_SHIFTED_ROOT_OFFSET 0x00000400 /* shifted root fs */
+
+/*
+ * Valid values in super.flags. Currently we refuse to mount
+ * if (flags & ~CRAMFS_SUPPORTED_FLAGS). Maybe that should be
+ * changed to test super.future instead.
+ */
+#define CRAMFS_SUPPORTED_FLAGS (0xff)
+
+/* Uncompression interfaces to the underlying zlib */
+int cramfs_uncompress_block(void *dst, int dstlen, void *src, int srclen);
+int cramfs_uncompress_init(void);
+int cramfs_uncompress_exit(void);
+
+#endif
diff --git a/disk-utils/fdformat.c b/disk-utils/fdformat.c
index e479059c3..e1b381173 100644
--- a/disk-utils/fdformat.c
+++ b/disk-utils/fdformat.c
@@ -18,12 +18,8 @@
#include "nls.h"
-/* cannot include <linux/fs.h> */
-#define MAJOR(a) ((a)>>8)
-
struct floppy_struct param;
-#define FLOPPY_MAJOR 2
#define SECTOR_SIZE 512
#define PERROR(msg) { perror(msg); exit(1); }
@@ -130,9 +126,10 @@ int main(int argc,char **argv)
}
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]);
+ if (!S_ISBLK(st.st_mode)) {
+ fprintf(stderr,_("%s: not a block device\n"),argv[1]);
exit(1);
+ /* do not test major - perhaps this was an USB floppy */
}
if (access(argv[1],W_OK) < 0) PERROR(argv[1]);
diff --git a/disk-utils/fsck.cramfs.c b/disk-utils/fsck.cramfs.c
new file mode 100644
index 000000000..3485bdc7c
--- /dev/null
+++ b/disk-utils/fsck.cramfs.c
@@ -0,0 +1,625 @@
+/*
+ * cramfsck - check a cramfs file system
+ *
+ * Copyright (C) 2000-2001 Transmeta Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 1999/12/03: Linus Torvalds (cramfs tester and unarchive program)
+ * 2000/06/03: Daniel Quinlan (CRC and length checking program)
+ * 2000/06/04: Daniel Quinlan (merged programs, added options, support
+ * for special files, preserve permissions and
+ * ownership, cramfs superblock v2, bogus mode
+ * test, pathname length test, etc.)
+ * 2000/06/06: Daniel Quinlan (support for holes, pretty-printing,
+ * symlink size test)
+ * 2000/07/11: Daniel Quinlan (file length tests, start at offset 0 or 512,
+ * fsck-compatible exit codes)
+ * 2000/07/15: Daniel Quinlan (initial support for block devices)
+ */
+
+/* compile-time options */
+#define INCLUDE_FS_TESTS /* include cramfs checking and extraction */
+
+#include <stdio.h>
+#include <unistd.h>
+#include <dirent.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <string.h>
+#include <getopt.h>
+#include <utime.h>
+#include <fcntl.h>
+#include <zlib.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <sys/ioctl.h>
+#include <sys/sysmacros.h> /* for major, minor */
+
+#include "cramfs.h"
+#include "../defines.h" /* for HAVE_lchown */
+#include "nls.h"
+
+#define BLKGETSIZE _IO(0x12,96) /* return device size */
+
+static const char *progname = "cramfsck";
+
+static int fd; /* ROM image file descriptor */
+static char *filename; /* ROM image filename */
+struct cramfs_super *super; /* just find the cramfs superblock once */
+static int opt_verbose = 0; /* 1 = verbose (-v), 2+ = very verbose (-vv) */
+
+#ifdef INCLUDE_FS_TESTS
+static int opt_extract = 0; /* extract cramfs (-x) */
+char *extract_dir = NULL; /* extraction directory (-x) */
+
+unsigned long start_inode = 1 << 28; /* start of first non-root inode */
+unsigned long end_inode = 0; /* end of the directory structure */
+unsigned long start_data = 1 << 28; /* start of the data (256 MB = max) */
+unsigned long end_data = 0; /* end of the data */
+/* true? cramfs_super < start_inode < end_inode <= start_data <= end_data */
+static uid_t euid; /* effective UID */
+
+#define PAD_SIZE 512
+#define PAGE_CACHE_SIZE (4096)
+
+/* Guarantee access to at least 8kB at a time */
+#define ROMBUFFER_BITS 13
+#define ROMBUFFERSIZE (1 << ROMBUFFER_BITS)
+#define ROMBUFFERMASK (ROMBUFFERSIZE-1)
+static char read_buffer[ROMBUFFERSIZE * 2];
+static unsigned long read_buffer_block = ~0UL;
+
+/* Uncompressing data structures... */
+static char outbuffer[PAGE_CACHE_SIZE*2];
+z_stream stream;
+
+#endif /* INCLUDE_FS_TESTS */
+
+/* Input status of 0 to print help and exit without an error. */
+static void usage(int status)
+{
+ FILE *stream = status ? stderr : stdout;
+
+ fprintf(stream, _("usage: %s [-hv] [-x dir] file\n"
+ " -h print this help\n"
+ " -x dir extract into dir\n"
+ " -v be more verbose\n"
+ " file file to test\n"), progname);
+
+ exit(status);
+}
+
+#ifdef INCLUDE_FS_TESTS
+static void print_node(char type, struct cramfs_inode *i, char *name)
+{
+ char info[10];
+
+ if (S_ISCHR(i->mode) || (S_ISBLK(i->mode))) {
+ /* major/minor numbers can be as high as 2^12 or 4096 */
+ snprintf(info, 10, "%4d,%4d", major(i->size), minor(i->size));
+ }
+ else {
+ /* size be as high as 2^24 or 16777216 */
+ snprintf(info, 10, "%9d", i->size);
+ }
+
+ printf("%c %04o %s %5d:%-3d %s\n",
+ type, i->mode & ~S_IFMT, info, i->uid, i->gid, name);
+}
+
+/*
+ * Create a fake "blocked" access
+ */
+static void *romfs_read(unsigned long offset)
+{
+ unsigned int block = offset >> ROMBUFFER_BITS;
+ if (block != read_buffer_block) {
+ read_buffer_block = block;
+ lseek(fd, block << ROMBUFFER_BITS, SEEK_SET);
+ read(fd, read_buffer, ROMBUFFERSIZE * 2);
+ }
+ return read_buffer + (offset & ROMBUFFERMASK);
+}
+
+static struct cramfs_inode *cramfs_iget(struct cramfs_inode * i)
+{
+ struct cramfs_inode *inode = malloc(sizeof(struct cramfs_inode));
+ *inode = *i;
+ return inode;
+}
+
+static struct cramfs_inode *iget(unsigned int ino)
+{
+ return cramfs_iget(romfs_read(ino));
+}
+
+#if 0
+static void iput(struct cramfs_inode *inode)
+{
+ free(inode);
+}
+#endif
+
+/*
+ * Return the offset of the root directory,
+ * or 0 if none.
+ */
+static struct cramfs_inode *read_super(void)
+{
+ unsigned long offset;
+
+ offset = super->root.offset << 2;
+ if (super->magic != CRAMFS_MAGIC)
+ return NULL;
+ if (memcmp(super->signature, CRAMFS_SIGNATURE, sizeof(super->signature)) != 0)
+ return NULL;
+ if (offset < sizeof(super))
+ return NULL;
+ return cramfs_iget(&super->root);
+}
+
+static int uncompress_block(void *src, int len)
+{
+ int err;
+
+ stream.next_in = src;
+ stream.avail_in = len;
+
+ stream.next_out = (unsigned char *) outbuffer;
+ stream.avail_out = PAGE_CACHE_SIZE*2;
+
+ inflateReset(&stream);
+
+ err = inflate(&stream, Z_FINISH);
+ if (err != Z_STREAM_END) {
+ fprintf(stderr,
+ _("%s: error %d while decompressing! %p(%d)\n"),
+ filename, err, src, len);
+ exit(4);
+ }
+ return stream.total_out;
+}
+
+#ifdef HAVE_lchown
+#define my_lchown lchown
+#else
+#define my_lchown chown
+#endif
+
+static void change_file_status(char *path, struct cramfs_inode *i)
+{
+ struct utimbuf epoch = { 0, 0 };
+
+ if (euid == 0) {
+ if (my_lchown(path, i->uid, i->gid) < 0) {
+ perror(path);
+ exit(8);
+ }
+ if (S_ISLNK(i->mode))
+ return;
+ if ((S_ISUID | S_ISGID) & i->mode) {
+ if (chmod(path, i->mode) < 0) {
+ perror(path);
+ exit(8);
+ }
+ }
+ }
+ if (S_ISLNK(i->mode))
+ return;
+ if (utime(path, &epoch) < 0) {
+ perror(path);
+ exit(8);
+ }
+}
+
+static void do_symlink(char *path, struct cramfs_inode *i)
+{
+ unsigned long offset = i->offset << 2;
+ unsigned long curr = offset + 4;
+ unsigned long next = *(u32 *) romfs_read(offset);
+ unsigned long size;
+
+ if (next > end_data) {
+ end_data = next;
+ }
+
+ size = uncompress_block(romfs_read(curr), next - curr);
+ if (size != i->size) {
+ fprintf(stderr, _("%s: size error in symlink `%s'\n"),
+ filename, path);
+ exit(4);
+ }
+ outbuffer[size] = 0;
+ if (opt_verbose) {
+ char *str;
+
+ str = malloc(strlen(outbuffer) + strlen(path) + 5);
+ strcpy(str, path);
+ strncat(str, " -> ", 4);
+ strncat(str, outbuffer, size);
+
+ print_node('l', i, str);
+ if (opt_verbose > 1) {
+ printf(_(" uncompressing block at %ld "
+ "to %ld (%ld)\n"),
+ curr, next, next - curr);
+ }
+ }
+ if (opt_extract) {
+ symlink(outbuffer, path);
+ change_file_status(path, i);
+ }
+}
+
+static void do_special_inode(char *path, struct cramfs_inode *i)
+{
+ dev_t devtype = 0;
+ char type;
+
+ if (S_ISCHR(i->mode)) {
+ devtype = i->size;
+ type = 'c';
+ }
+ else if (S_ISBLK(i->mode)) {
+ devtype = i->size;
+ type = 'b';
+ }
+ else if (S_ISFIFO(i->mode))
+ type = 'p';
+ else if (S_ISSOCK(i->mode))
+ type = 's';
+ else {
+ fprintf(stderr, _("%s: bogus mode on `%s' (%o)\n"),
+ filename, path, i->mode);
+ exit(4);
+ }
+
+ if (opt_verbose) {
+ print_node(type, i, path);
+ }
+
+ if (opt_extract) {
+ if (mknod(path, i->mode, devtype) < 0) {
+ perror(path);
+ exit(8);
+ }
+ change_file_status(path, i);
+ }
+}
+
+static void do_uncompress(int fd, unsigned long offset, unsigned long size)
+{
+ unsigned long curr = offset + 4 * ((size + PAGE_CACHE_SIZE - 1) / PAGE_CACHE_SIZE);
+
+ do {
+ unsigned long out = PAGE_CACHE_SIZE;
+ unsigned long next = *(u32 *) romfs_read(offset);
+
+ if (next > end_data)
+ end_data = next;
+
+ offset += 4;
+ if (curr == next) {
+ if (opt_verbose > 1) {
+ printf(_(" hole at %ld (%d)\n"),
+ curr, PAGE_CACHE_SIZE);
+ }
+ if (size < PAGE_CACHE_SIZE)
+ out = size;
+ memset(outbuffer, 0x00, out);
+ }
+ else {
+ if (opt_verbose > 1) {
+ printf(_(" uncompressing block at %ld "
+ "to %ld (%ld)\n"),
+ curr, next, next - curr);
+ }
+ out = uncompress_block(romfs_read(curr), next - curr);
+ }
+ if (size >= PAGE_CACHE_SIZE) {
+ if (out != PAGE_CACHE_SIZE) {
+ fprintf(stderr,
+ _("%s: Non-block (%ld) bytes\n"),
+ filename, out);
+ exit(4);
+ }
+ } else {
+ if (out != size) {
+ fprintf(stderr, _("%s: Non-size (%ld vs %ld) "
+ "bytes\n"),
+ filename, out, size);
+ exit(4);
+ }
+ }
+ size -= out;
+ if (opt_extract) {
+ write(fd, outbuffer, out);
+ }
+ curr = next;
+ } while (size);
+}
+
+static void expand_fs(int pathlen, char *path, struct cramfs_inode *inode)
+{
+ if (S_ISDIR(inode->mode)) {
+ int count = inode->size;
+ unsigned long offset = inode->offset << 2;
+ char *newpath = malloc(pathlen + 256);
+
+ if (count > 0 && offset < start_inode) {
+ start_inode = offset;
+ }
+ /* XXX - need to check end_inode for empty case? */
+ memcpy(newpath, path, pathlen);
+ newpath[pathlen] = '/';
+ pathlen++;
+ if (opt_verbose) {
+ print_node('d', inode, path);
+ }
+ if (opt_extract) {
+ mkdir(path, inode->mode);
+ change_file_status(path, inode);
+ }
+ while (count > 0) {
+ struct cramfs_inode *child = iget(offset);
+ int size;
+ int newlen = child->namelen << 2;
+
+ size = sizeof(struct cramfs_inode) + newlen;
+ count -= size;
+
+ offset += sizeof(struct cramfs_inode);
+
+ memcpy(newpath + pathlen, romfs_read(offset), newlen);
+ newpath[pathlen + newlen] = 0;
+ if ((pathlen + newlen) - strlen(newpath) > 3) {
+ fprintf(stderr,
+ _("%s: invalid cramfs--bad "
+ "path length\n"),
+ filename);
+ exit(4);
+ }
+ expand_fs(strlen(newpath), newpath, child);
+
+ offset += newlen;
+
+ if (offset > end_inode) {
+ end_inode = offset;
+ }
+ }
+ return;
+ }
+ if (S_ISREG(inode->mode)) {
+ int fd = 0;
+ unsigned long offset = inode->offset << 2;
+
+ if (offset > 0 && offset < start_data) {
+ start_data = offset;
+ }
+ if (opt_verbose) {
+ print_node('f', inode, path);
+ }
+ if (opt_extract) {
+ fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, inode->mode);
+ }
+ if (inode->size) {
+ do_uncompress(fd, offset, inode->size);
+ }
+ if (opt_extract) {
+ close(fd);
+ change_file_status(path, inode);
+ }
+ return;
+ }
+ if (S_ISLNK(inode->mode)) {
+ unsigned long offset = inode->offset << 2;
+
+ if (offset < start_data) {
+ start_data = offset;
+ }
+ do_symlink(path, inode);
+ return;
+ }
+ else {
+ do_special_inode(path, inode);
+ return;
+ }
+}
+#endif /* INCLUDE_FS_TESTS */
+
+int main(int argc, char **argv)
+{
+ void *buf;
+ size_t length;
+ struct stat st;
+ u32 crc_old, crc_new;
+#ifdef INCLUDE_FS_TESTS
+ struct cramfs_inode *root;
+#endif /* INCLUDE_FS_TESTS */
+ int c; /* for getopt */
+ int start = 0;
+
+ if (argc)
+ progname = argv[0];
+
+ /* command line options */
+ while ((c = getopt(argc, argv, "hx:v")) != EOF) {
+ switch (c) {
+ case 'h':
+ usage(0);
+ case 'x':
+#ifdef INCLUDE_FS_TESTS
+ opt_extract = 1;
+ extract_dir = malloc(strlen(optarg) + 1);
+ strcpy(extract_dir, optarg);
+ break;
+#else /* not INCLUDE_FS_TESTS */
+ fprintf(stderr, _("%s: compiled without -x support\n"),
+ progname);
+ exit(16);
+#endif /* not INCLUDE_FS_TESTS */
+ case 'v':
+ opt_verbose++;
+ break;
+ }
+ }
+
+ if ((argc - optind) != 1)
+ usage(16);
+ filename = argv[optind];
+
+ /* find the physical size of the file or block device */
+ if (lstat(filename, &st) < 0) {
+ perror(filename);
+ exit(8);
+ }
+ fd = open(filename, O_RDONLY);
+ if (fd < 0) {
+ perror(filename);
+ exit(8);
+ }
+ if (S_ISBLK(st.st_mode)) {
+ if (ioctl(fd, BLKGETSIZE, &length) < 0) {
+ fprintf(stderr, _("%s: warning--unable to determine "
+ "filesystem size \n"), filename);
+ exit(4);
+ }
+ length = length * 512;
+ }
+ else if (S_ISREG(st.st_mode)) {
+ length = st.st_size;
+ }
+ else {
+ fprintf(stderr, _("%s is not a block device or file\n"),
+ filename);
+ exit(8);
+ }
+
+ if (length < sizeof(struct cramfs_super)) {
+ fprintf(stderr, _("%s: invalid cramfs--file length "
+ "too short\n"), filename);
+ exit(4);
+ }
+
+ if (S_ISBLK(st.st_mode)) {
+ /* nasty because mmap of block devices fails */
+ buf = mmap(NULL, length, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+ read(fd, buf, length);
+ }
+ else {
+ /* nice and easy */
+ buf = mmap(NULL, length, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
+ }
+
+ /* XXX - this could be cleaner... */
+ if (((struct cramfs_super *) buf)->magic == CRAMFS_MAGIC) {
+ start = 0;
+ super = (struct cramfs_super *) buf;
+ }
+ else if (length >= (PAD_SIZE + sizeof(struct cramfs_super)) &&
+ ((((struct cramfs_super *) (buf + PAD_SIZE))->magic == CRAMFS_MAGIC)))
+ {
+ start = PAD_SIZE;
+ super = (struct cramfs_super *) (buf + PAD_SIZE);
+ }
+ else {
+ fprintf(stderr, _("%s: invalid cramfs--wrong magic\n"),
+ filename);
+ exit(4);
+ }
+
+ if (super->flags & CRAMFS_FLAG_FSID_VERSION_2) {
+ /* length test */
+ if (length < super->size) {
+ fprintf(stderr, _("%s: invalid cramfs--file length "
+ "too short\n"), filename);
+ exit(4);
+ }
+ else if (length > super->size) {
+ fprintf(stderr, _("%s: warning--file length too long, "
+ "padded image?\n"), filename);
+ }
+
+ /* CRC test */
+ crc_old = super->fsid.crc;
+ super->fsid.crc = crc32(0L, Z_NULL, 0);
+ crc_new = crc32(0L, Z_NULL, 0);
+ crc_new = crc32(crc_new, (unsigned char *) buf+start, super->size - start);
+ if (crc_new != crc_old) {
+ fprintf(stderr, _("%s: invalid cramfs--crc error\n"),
+ filename);
+ exit(4);
+ }
+ }
+ else {
+ fprintf(stderr, _("%s: warning--old cramfs image, no CRC\n"),
+ filename);
+ }
+
+#ifdef INCLUDE_FS_TESTS
+ super = (struct cramfs_super *) malloc(sizeof(struct cramfs_super));
+ if (((struct cramfs_super *) buf)->magic == CRAMFS_MAGIC) {
+ memcpy(super, buf, sizeof(struct cramfs_super));
+ }
+ else if (length >= (PAD_SIZE + sizeof(struct cramfs_super)) &&
+ ((((struct cramfs_super *) (buf + PAD_SIZE))->magic == CRAMFS_MAGIC)))
+ {
+ memcpy(super, (buf + PAD_SIZE), sizeof(struct cramfs_super));
+ }
+
+ munmap(buf, length);
+
+ /* file format test, uses fake "blocked" accesses */
+ root = read_super();
+ umask(0);
+ euid = geteuid();
+ if (!root) {
+ fprintf(stderr, _("%s: invalid cramfs--bad superblock\n"),
+ filename);
+ exit(4);
+ }
+ stream.next_in = NULL;
+ stream.avail_in = 0;
+ inflateInit(&stream);
+
+ if (!extract_dir)
+ extract_dir = "root";
+
+ expand_fs(strlen(extract_dir), extract_dir, root);
+ inflateEnd(&stream);
+
+ if (start_data != 1 << 28 && end_inode != start_data) {
+ fprintf(stderr,
+ _("%s: invalid cramfs--directory data end "
+ "(%ld) != file data start (%ld)\n"),
+ filename, end_inode, start_data);
+ exit(4);
+ }
+ if (super->flags & CRAMFS_FLAG_FSID_VERSION_2) {
+ if (end_data > super->size) {
+ fprintf(stderr,
+ _("%s: invalid cramfs--invalid file "
+ "data offset\n"),
+ filename);
+ exit(4);
+ }
+ }
+#endif /* INCLUDE_FS_TESTS */
+
+ exit(0);
+}
diff --git a/disk-utils/mkfs.8 b/disk-utils/mkfs.8
index da69772c9..760a5e087 100644
--- a/disk-utils/mkfs.8
+++ b/disk-utils/mkfs.8
@@ -113,8 +113,11 @@ for the ext2 file system.
.BR fsck (8),
.BR mkdosfs (8),
.BR mke2fs (8),
+.BR mkfs.bfs (8),
.BR mkfs.ext2 (8),
+.BR mkfs.ext3 (8),
.BR mkfs.minix (8),
.BR mkfs.msdos (8),
+.BR mkfs.vfat (8),
.BR mkfs.xfs (8),
.BR mkfs.xiafs (8)
diff --git a/disk-utils/mkfs.cramfs.c b/disk-utils/mkfs.cramfs.c
new file mode 100644
index 000000000..5556708e4
--- /dev/null
+++ b/disk-utils/mkfs.cramfs.c
@@ -0,0 +1,828 @@
+/*
+ * mkcramfs - make a cramfs file system
+ *
+ * Copyright (C) 1999-2001 Transmeta Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include <sys/types.h>
+#include <stdio.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <sys/mman.h>
+#include <sys/fcntl.h>
+#include <dirent.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <string.h>
+#include <assert.h>
+#include <getopt.h>
+#include <zlib.h>
+
+#include "cramfs.h"
+#include "nls.h"
+
+#define PAD_SIZE 512 /* only 0 and 512 supported by kernel */
+
+static const char *progname = "mkcramfs";
+static int verbose = 0;
+
+/* Input status of 0 to print help and exit without an error. */
+static void usage(int status)
+{
+ FILE *stream = status ? stderr : stdout;
+
+ fprintf(stream,
+ _("usage: %s [-h] [-v] [-e edition] [-i file] [-n name] "
+ "dirname outfile\n"
+ " -h print this help\n"
+ " -v be verbose\n"
+ " -E make all warnings errors "
+ "(non-zero exit status)\n"
+ " -e edition set edition number (part of fsid)\n"
+ " -i file insert a file image into the filesystem "
+ "(requires >= 2.4.0)\n"
+ " -n name set name of cramfs filesystem\n"
+ " -p pad by %d bytes for boot code\n"
+ " -s sort directory entries (old option, ignored)\n"
+ " -z make explicit holes (requires >= 2.3.39)\n"
+ " dirname root of the filesystem to be compressed\n"
+ " outfile output file\n"),
+ progname, PAD_SIZE);
+
+ exit(status);
+}
+
+#define PAGE_CACHE_SIZE (4096)
+/* The kernel assumes PAGE_CACHE_SIZE as block size. */
+static unsigned int blksize = PAGE_CACHE_SIZE;
+static long total_blocks = 0, total_nodes = 1; /* pre-count the root node */
+static int image_length = 0;
+
+/*
+ * If opt_holes is set, then mkcramfs can create explicit holes in the
+ * data, which saves 26 bytes per hole (which is a lot smaller a
+ * saving than most most filesystems).
+ *
+ * Note that kernels up to at least 2.3.39 don't support cramfs holes,
+ * which is why this is turned off by default.
+ */
+static int opt_edition = 0;
+static int opt_errors = 0;
+static int opt_holes = 0;
+static int opt_pad = 0;
+static char *opt_image = NULL;
+static char *opt_name = NULL;
+
+static int warn_dev, warn_gid, warn_namelen, warn_skip, warn_size, warn_uid;
+
+#ifndef MIN
+# define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
+#endif
+
+/* In-core version of inode / directory entry. */
+struct entry {
+ /* stats */
+ char *name;
+ unsigned int mode, size, uid, gid;
+
+ /* FS data */
+ void *uncompressed;
+ /* points to other identical file */
+ struct entry *same;
+ unsigned int offset; /* pointer to compressed data in archive */
+ unsigned int dir_offset; /* Where in the archive is the directory entry? */
+
+ /* organization */
+ struct entry *child; /* null for non-directories and empty directories */
+ struct entry *next;
+};
+
+/*
+ * Width of various bitfields in struct cramfs_inode.
+ * Used only to generate warnings.
+ */
+#define CRAMFS_SIZE_WIDTH 24
+#define CRAMFS_UID_WIDTH 16
+#define CRAMFS_GID_WIDTH 8
+#define CRAMFS_OFFSET_WIDTH 26
+
+/*
+ * The longest file name component to allow for in the input directory tree.
+ * Ext2fs (and many others) allow up to 255 bytes. A couple of filesystems
+ * allow longer (e.g. smbfs 1024), but there isn't much use in supporting
+ * >255-byte names in the input directory tree given that such names get
+ * truncated to 255 bytes when written to cramfs.
+ */
+#define MAX_INPUT_NAMELEN 255
+
+static int find_identical_file(struct entry *orig,struct entry *newfile)
+{
+ if(orig==newfile) return 1;
+ if(!orig) return 0;
+ if(orig->size==newfile->size && orig->uncompressed && !memcmp(orig->uncompressed,newfile->uncompressed,orig->size)) {
+ newfile->same=orig;
+ return 1;
+ }
+ return find_identical_file(orig->child,newfile) ||
+ find_identical_file(orig->next,newfile);
+}
+
+static void eliminate_doubles(struct entry *root,struct entry *orig) {
+ if(orig) {
+ if(orig->size && orig->uncompressed)
+ find_identical_file(root,orig);
+ eliminate_doubles(root,orig->child);
+ eliminate_doubles(root,orig->next);
+ }
+}
+
+/*
+ * We define our own sorting function instead of using alphasort which
+ * uses strcoll and changes ordering based on locale information.
+ */
+static int cramsort (const void *a, const void *b)
+{
+ return strcmp ((*(const struct dirent **) a)->d_name,
+ (*(const struct dirent **) b)->d_name);
+}
+
+static unsigned int parse_directory(struct entry *root_entry, const char *name, struct entry **prev, loff_t *fslen_ub)
+{
+ struct dirent **dirlist;
+ int totalsize = 0, dircount, dirindex;
+ char *path, *endpath;
+ size_t len = strlen(name);
+
+ /* Set up the path. */
+ /* TODO: Reuse the parent's buffer to save memcpy'ing and duplication. */
+ path = malloc(len + 1 + MAX_INPUT_NAMELEN + 1);
+ if (!path) {
+ perror(NULL);
+ exit(8);
+ }
+ memcpy(path, name, len);
+ endpath = path + len;
+ *endpath = '/';
+ endpath++;
+
+ /* read in the directory and sort */
+ dircount = scandir(name, &dirlist, 0, cramsort);
+
+ if (dircount < 0) {
+ perror(name);
+ exit(8);
+ }
+
+ /* process directory */
+ for (dirindex = 0; dirindex < dircount; dirindex++) {
+ struct dirent *dirent;
+ struct entry *entry;
+ struct stat st;
+ int size;
+ size_t namelen;
+
+ dirent = dirlist[dirindex];
+
+ /* Ignore "." and ".." - we won't be adding them
+ to the archive */
+ if (dirent->d_name[0] == '.') {
+ if (dirent->d_name[1] == '\0')
+ continue;
+ if (dirent->d_name[1] == '.') {
+ if (dirent->d_name[2] == '\0')
+ continue;
+ }
+ }
+ namelen = strlen(dirent->d_name);
+ if (namelen > MAX_INPUT_NAMELEN) {
+ fprintf(stderr,
+ _("Very long (%u bytes) filename `%s' found.\n"
+ " Please increase MAX_INPUT_NAMELEN in "
+ "mkcramfs.c and recompile. Exiting.\n"),
+ namelen, dirent->d_name);
+ exit(8);
+ }
+ memcpy(endpath, dirent->d_name, namelen + 1);
+
+ if (lstat(path, &st) < 0) {
+ perror(endpath);
+ warn_skip = 1;
+ continue;
+ }
+ entry = calloc(1, sizeof(struct entry));
+ if (!entry) {
+ perror(NULL);
+ exit(8);
+ }
+ entry->name = strdup(dirent->d_name);
+ if (!entry->name) {
+ perror(NULL);
+ exit(8);
+ }
+ if (namelen > 255) {
+ /* Can't happen when reading from ext2fs. */
+
+ /* TODO: we ought to avoid chopping in half
+ multi-byte UTF8 characters. */
+ entry->name[namelen = 255] = '\0';
+ warn_namelen = 1;
+ }
+ entry->mode = st.st_mode;
+ entry->size = st.st_size;
+ entry->uid = st.st_uid;
+ if (entry->uid >= 1 << CRAMFS_UID_WIDTH)
+ warn_uid = 1;
+ entry->gid = st.st_gid;
+ if (entry->gid >= 1 << CRAMFS_GID_WIDTH)
+ /* TODO: We ought to replace with a default
+ gid instead of truncating; otherwise there
+ are security problems. Maybe mode should
+ be &= ~070. Same goes for uid once Linux
+ supports >16-bit uids. */
+ warn_gid = 1;
+ size = sizeof(struct cramfs_inode) + ((namelen + 3) & ~3);
+ *fslen_ub += size;
+ if (S_ISDIR(st.st_mode)) {
+ entry->size = parse_directory(root_entry, path, &entry->child, fslen_ub);
+ } else if (S_ISREG(st.st_mode)) {
+ /* TODO: We ought to open files in do_compress, one
+ at a time, instead of amassing all these memory
+ maps during parse_directory (which don't get used
+ until do_compress anyway). As it is, we tend to
+ get EMFILE errors (especially if mkcramfs is run
+ by non-root).
+
+ While we're at it, do analagously for symlinks
+ (which would just save a little memory). */
+ int fd = open(path, O_RDONLY);
+ if (fd < 0) {
+ perror(path);
+ warn_skip = 1;
+ continue;
+ }
+ if (entry->size) {
+ if ((entry->size >= 1 << CRAMFS_SIZE_WIDTH)) {
+ warn_size = 1;
+ entry->size = (1 << CRAMFS_SIZE_WIDTH) - 1;
+ }
+
+ entry->uncompressed = mmap(NULL, entry->size, PROT_READ, MAP_PRIVATE, fd, 0);
+ if (-1 == (int) (long) entry->uncompressed) {
+ perror("mmap");
+ exit(8);
+ }
+ }
+ close(fd);
+ } else if (S_ISLNK(st.st_mode)) {
+ entry->uncompressed = malloc(entry->size);
+ if (!entry->uncompressed) {
+ perror(NULL);
+ exit(8);
+ }
+ if (readlink(path, entry->uncompressed, entry->size) < 0) {
+ perror(path);
+ warn_skip = 1;
+ continue;
+ }
+ } else if (S_ISFIFO(st.st_mode) || S_ISSOCK(st.st_mode)) {
+ /* maybe we should skip sockets */
+ entry->size = 0;
+ } else {
+ entry->size = st.st_rdev;
+ if (entry->size & -(1<<CRAMFS_SIZE_WIDTH))
+ warn_dev = 1;
+ }
+
+ if (S_ISREG(st.st_mode) || S_ISLNK(st.st_mode)) {
+ int blocks = ((entry->size - 1) / blksize + 1);
+
+ /* block pointers & data expansion allowance + data */
+ if(entry->size)
+ *fslen_ub += (4+26)*blocks + entry->size + 3;
+ }
+
+ /* Link it into the list */
+ *prev = entry;
+ prev = &entry->next;
+ totalsize += size;
+ }
+ free(path);
+ free(dirlist); /* allocated by scandir() with malloc() */
+ return totalsize;
+}
+
+/* Returns sizeof(struct cramfs_super), which includes the root inode. */
+static unsigned int write_superblock(struct entry *root, char *base, int size)
+{
+ struct cramfs_super *super = (struct cramfs_super *) base;
+ unsigned int offset = sizeof(struct cramfs_super) + image_length;
+
+ if (opt_pad) {
+ offset += opt_pad;
+ }
+
+ super->magic = CRAMFS_MAGIC;
+ super->flags = CRAMFS_FLAG_FSID_VERSION_2 | CRAMFS_FLAG_SORTED_DIRS;
+ if (opt_holes)
+ super->flags |= CRAMFS_FLAG_HOLES;
+ if (image_length > 0)
+ super->flags |= CRAMFS_FLAG_SHIFTED_ROOT_OFFSET;
+ super->size = size;
+ memcpy(super->signature, CRAMFS_SIGNATURE, sizeof(super->signature));
+
+ super->fsid.crc = crc32(0L, Z_NULL, 0);
+ super->fsid.edition = opt_edition;
+ super->fsid.blocks = total_blocks;
+ super->fsid.files = total_nodes;
+
+ memset(super->name, 0x00, sizeof(super->name));
+ if (opt_name)
+ strncpy(super->name, opt_name, sizeof(super->name));
+ else
+ strncpy(super->name, "Compressed", sizeof(super->name));
+
+ super->root.mode = root->mode;
+ super->root.uid = root->uid;
+ super->root.gid = root->gid;
+ super->root.size = root->size;
+ super->root.offset = offset >> 2;
+
+ return offset;
+}
+
+static void set_data_offset(struct entry *entry, char *base, unsigned long offset)
+{
+ struct cramfs_inode *inode = (struct cramfs_inode *) (base + entry->dir_offset);
+ if (offset >= (1 << (2 + CRAMFS_OFFSET_WIDTH))) {
+ fprintf(stderr, _("filesystem too big. Exiting.\n"));
+ exit(8);
+ }
+ inode->offset = (offset >> 2);
+}
+
+
+/*
+ * We do a width-first printout of the directory
+ * entries, using a stack to remember the directories
+ * we've seen.
+ */
+#define MAXENTRIES (100)
+static unsigned int write_directory_structure(struct entry *entry, char *base, unsigned int offset)
+{
+ int stack_entries = 0;
+ struct entry *entry_stack[MAXENTRIES];
+
+ for (;;) {
+ int dir_start = stack_entries;
+ while (entry) {
+ struct cramfs_inode *inode =
+ (struct cramfs_inode *) (base + offset);
+ size_t len = strlen(entry->name);
+
+ entry->dir_offset = offset;
+
+ inode->mode = entry->mode;
+ inode->uid = entry->uid;
+ inode->gid = entry->gid;
+ inode->size = entry->size;
+ inode->offset = 0;
+ /* Non-empty directories, regfiles and symlinks will
+ write over inode->offset later. */
+
+ offset += sizeof(struct cramfs_inode);
+ total_nodes++; /* another node */
+ memcpy(base + offset, entry->name, len);
+ /* Pad up the name to a 4-byte boundary */
+ while (len & 3) {
+ *(base + offset + len) = '\0';
+ len++;
+ }
+ inode->namelen = len >> 2;
+ offset += len;
+
+ if (verbose)
+ printf(" %s\n", entry->name);
+ if (entry->child) {
+ if (stack_entries >= MAXENTRIES) {
+ fprintf(stderr,
+ _("Exceeded MAXENTRIES. Raise"
+ " this value in mkcramfs.c "
+ "and recompile. Exiting.\n")
+ );
+ exit(8);
+ }
+ entry_stack[stack_entries] = entry;
+ stack_entries++;
+ }
+ entry = entry->next;
+ }
+
+ /*
+ * Reverse the order the stack entries pushed during
+ * this directory, for a small optimization of disk
+ * access in the created fs. This change makes things
+ * `ls -UR' order.
+ */
+ {
+ struct entry **lo = entry_stack + dir_start;
+ struct entry **hi = entry_stack + stack_entries;
+ struct entry *tmp;
+
+ while (lo < --hi) {
+ tmp = *lo;
+ *lo++ = *hi;
+ *hi = tmp;
+ }
+ }
+
+ /* Pop a subdirectory entry from the stack, and recurse. */
+ if (!stack_entries)
+ break;
+ stack_entries--;
+ entry = entry_stack[stack_entries];
+
+ set_data_offset(entry, base, offset);
+ if (verbose)
+ printf("'%s':\n", entry->name);
+ entry = entry->child;
+ }
+ return offset;
+}
+
+static int is_zero(char const *begin, unsigned len)
+{
+ if (opt_holes)
+ /* Returns non-zero iff the first LEN bytes from BEGIN are
+ all NULs. */
+ return (len-- == 0 ||
+ (begin[0] == '\0' &&
+ (len-- == 0 ||
+ (begin[1] == '\0' &&
+ (len-- == 0 ||
+ (begin[2] == '\0' &&
+ (len-- == 0 ||
+ (begin[3] == '\0' &&
+ memcmp(begin, begin + 4, len) == 0))))))));
+ else
+ /* Never create holes. */
+ return 0;
+}
+
+/*
+ * One 4-byte pointer per block and then the actual blocked
+ * output. The first block does not need an offset pointer,
+ * as it will start immediately after the pointer block;
+ * so the i'th pointer points to the end of the i'th block
+ * (i.e. the start of the (i+1)'th block or past EOF).
+ *
+ * Note that size > 0, as a zero-sized file wouldn't ever
+ * have gotten here in the first place.
+ */
+static unsigned int do_compress(char *base, unsigned int offset, char const *name, char *uncompressed, unsigned int size)
+{
+ unsigned long original_size = size;
+ unsigned long original_offset = offset;
+ unsigned long new_size;
+ unsigned long blocks = (size - 1) / blksize + 1;
+ unsigned long curr = offset + 4 * blocks;
+ int change;
+
+ total_blocks += blocks;
+
+ do {
+ unsigned long len = 2 * blksize;
+ unsigned int input = size;
+ if (input > blksize)
+ input = blksize;
+ size -= input;
+ if (!is_zero (uncompressed, input)) {
+ compress(base + curr, &len, uncompressed, input);
+ curr += len;
+ }
+ uncompressed += input;
+
+ if (len > blksize*2) {
+ /* (I don't think this can happen with zlib.) */
+ printf(_("AIEEE: block \"compressed\" to > "
+ "2*blocklength (%ld)\n"),
+ len);
+ exit(8);
+ }
+
+ *(u32 *) (base + offset) = curr;
+ offset += 4;
+ } while (size);
+
+ curr = (curr + 3) & ~3;
+ new_size = curr - original_offset;
+ /* TODO: Arguably, original_size in these 2 lines should be
+ st_blocks * 512. But if you say that then perhaps
+ administrative data should also be included in both. */
+ change = new_size - original_size;
+ if (verbose)
+ printf(_("%6.2f%% (%+d bytes)\t%s\n"),
+ (change * 100) / (double) original_size, change, name);
+
+ return curr;
+}
+
+
+/*
+ * Traverse the entry tree, writing data for every item that has
+ * non-null entry->compressed (i.e. every symlink and non-empty
+ * regfile).
+ */
+static unsigned int write_data(struct entry *entry, char *base, unsigned int offset)
+{
+ do {
+ if (entry->uncompressed) {
+ if(entry->same) {
+ set_data_offset(entry, base, entry->same->offset);
+ entry->offset=entry->same->offset;
+ } else {
+ set_data_offset(entry, base, offset);
+ entry->offset=offset;
+ offset = do_compress(base, offset, entry->name, entry->uncompressed, entry->size);
+ }
+ }
+ else if (entry->child)
+ offset = write_data(entry->child, base, offset);
+ entry=entry->next;
+ } while (entry);
+ return offset;
+}
+
+static unsigned int write_file(char *file, char *base, unsigned int offset)
+{
+ int fd;
+ char *buf;
+
+ fd = open(file, O_RDONLY);
+ if (fd < 0) {
+ perror(file);
+ exit(8);
+ }
+ buf = mmap(NULL, image_length, PROT_READ, MAP_PRIVATE, fd, 0);
+ memcpy(base + offset, buf, image_length);
+ munmap(buf, image_length);
+ close (fd);
+ /* Pad up the image_length to a 4-byte boundary */
+ while (image_length & 3) {
+ *(base + offset + image_length) = '\0';
+ image_length++;
+ }
+ return (offset + image_length);
+}
+
+/*
+ * Maximum size fs you can create is roughly 256MB. (The last file's
+ * data must begin within 256MB boundary but can extend beyond that.)
+ *
+ * Note that if you want it to fit in a ROM then you're limited to what the
+ * hardware and kernel can support (64MB?).
+ */
+#define MAXFSLEN ((((1 << CRAMFS_OFFSET_WIDTH) - 1) << 2) /* offset */ \
+ + (1 << CRAMFS_SIZE_WIDTH) - 1 /* filesize */ \
+ + (1 << CRAMFS_SIZE_WIDTH) * 4 / PAGE_CACHE_SIZE /* block pointers */ )
+
+
+/*
+ * Usage:
+ *
+ * mkcramfs directory-name outfile
+ *
+ * where "directory-name" is simply the root of the directory
+ * tree that we want to generate a compressed filesystem out
+ * of.
+ */
+int main(int argc, char **argv)
+{
+ struct stat st; /* used twice... */
+ struct entry *root_entry;
+ char *rom_image;
+ ssize_t offset, written;
+ int fd;
+ /* initial guess (upper-bound) of required filesystem size */
+ loff_t fslen_ub = sizeof(struct cramfs_super);
+ char const *dirname, *outfile;
+ u32 crc = crc32(0L, Z_NULL, 0);
+ int c; /* for getopt */
+
+ total_blocks = 0;
+
+ if (argc) {
+ char *p;
+ progname = argv[0];
+ if ((p = strrchr(progname, '/')) != NULL)
+ progname = p+1;
+ }
+
+ /* command line options */
+ while ((c = getopt(argc, argv, "hEe:i:n:psVvz")) != EOF) {
+ switch (c) {
+ case 'h':
+ usage(0);
+ case 'E':
+ opt_errors = 1;
+ break;
+ case 'e':
+ opt_edition = atoi(optarg);
+ break;
+ case 'i':
+ opt_image = optarg;
+ if (lstat(opt_image, &st) < 0) {
+ perror(opt_image);
+ exit(16);
+ }
+ image_length = st.st_size; /* may be padded later */
+ fslen_ub += (image_length + 3); /* 3 is for padding */
+ break;
+ case 'n':
+ opt_name = optarg;
+ break;
+ case 'p':
+ opt_pad = PAD_SIZE;
+ fslen_ub += PAD_SIZE;
+ break;
+ case 's':
+ /* old option, ignored */
+ break;
+ case 'V':
+ printf(_("%s from %s\n"),
+ progname, util_linux_version);
+ exit(0);
+ case 'v':
+ verbose = 1;
+ break;
+ case 'z':
+ opt_holes = 1;
+ break;
+ }
+ }
+
+ if ((argc - optind) != 2)
+ usage(16);
+ dirname = argv[optind];
+ outfile = argv[optind + 1];
+
+ if (stat(dirname, &st) < 0) {
+ perror(dirname);
+ exit(16);
+ }
+ fd = open(outfile, O_WRONLY | O_CREAT | O_TRUNC, 0666);
+
+ root_entry = calloc(1, sizeof(struct entry));
+ if (!root_entry) {
+ perror(NULL);
+ exit(8);
+ }
+ root_entry->mode = st.st_mode;
+ root_entry->uid = st.st_uid;
+ root_entry->gid = st.st_gid;
+
+ root_entry->size = parse_directory(root_entry, dirname, &root_entry->child, &fslen_ub);
+
+ /* always allocate a multiple of blksize bytes because that's
+ what we're going to write later on */
+ fslen_ub = ((fslen_ub - 1) | (blksize - 1)) + 1;
+
+ if (fslen_ub > MAXFSLEN) {
+ fprintf(stderr,
+ _("warning: guestimate of required size (upper bound) "
+ "is %LdMB, but maximum image size is %uMB. "
+ "We might die prematurely.\n"),
+ fslen_ub >> 20,
+ MAXFSLEN >> 20);
+ fslen_ub = MAXFSLEN;
+ }
+
+ /* find duplicate files. TODO: uses the most inefficient algorithm
+ possible. */
+ eliminate_doubles(root_entry,root_entry);
+
+ /* TODO: Why do we use a private/anonymous mapping here
+ followed by a write below, instead of just a shared mapping
+ and a couple of ftruncate calls? Is it just to save us
+ having to deal with removing the file afterwards? If we
+ really need this huge anonymous mapping, we ought to mmap
+ in smaller chunks, so that the user doesn't need nn MB of
+ RAM free. If the reason is to be able to write to
+ un-mmappable block devices, then we could try shared mmap
+ and revert to anonymous mmap if the shared mmap fails. */
+ rom_image = mmap(NULL,
+ fslen_ub?fslen_ub:1,
+ PROT_READ | PROT_WRITE,
+ MAP_PRIVATE | MAP_ANONYMOUS,
+ -1, 0);
+
+ if (-1 == (int) (long) rom_image) {
+ perror("ROM image map");
+ exit(8);
+ }
+
+ /* Skip the first opt_pad bytes for boot loader code */
+ offset = opt_pad;
+ memset(rom_image, 0x00, opt_pad);
+
+ /* Skip the superblock and come back to write it later. */
+ offset += sizeof(struct cramfs_super);
+
+ /* Insert a file image. */
+ if (opt_image) {
+ if (verbose)
+ printf(_("Including: %s\n"), opt_image);
+ offset = write_file(opt_image, rom_image, offset);
+ }
+
+ offset = write_directory_structure(root_entry->child, rom_image, offset);
+ if (verbose)
+ printf(_("Directory data: %d bytes\n"), offset);
+
+ offset = write_data(root_entry, rom_image, offset);
+
+ /* We always write a multiple of blksize bytes, so that
+ losetup works. */
+ offset = ((offset - 1) | (blksize - 1)) + 1;
+ if (verbose)
+ printf(_("Everything: %d kilobytes\n"), offset >> 10);
+
+ /* Write the superblock now that we can fill in all of the fields. */
+ write_superblock(root_entry, rom_image+opt_pad, offset);
+ if (verbose)
+ printf(_("Super block: %d bytes\n"),
+ sizeof(struct cramfs_super));
+
+ /* Put the checksum in. */
+ crc = crc32(crc, (rom_image+opt_pad), (offset-opt_pad));
+ ((struct cramfs_super *) (rom_image+opt_pad))->fsid.crc = crc;
+ if (verbose)
+ printf(_("CRC: %x\n"), crc);
+
+ /* Check to make sure we allocated enough space. */
+ if (fslen_ub < offset) {
+ fprintf(stderr,
+ _("not enough space allocated for ROM image "
+ "(%Ld allocated, %d used)\n"),
+ fslen_ub, offset);
+ exit(8);
+ }
+
+ written = write(fd, rom_image, offset);
+ if (written < 0) {
+ perror("ROM image");
+ exit(8);
+ }
+ if (offset != written) {
+ fprintf(stderr, _("ROM image write failed (%d %d)\n"),
+ written, offset);
+ exit(8);
+ }
+
+ /* (These warnings used to come at the start, but they scroll off the
+ screen too quickly.) */
+ if (warn_namelen) /* (can't happen when reading from ext2fs) */
+ fprintf(stderr, /* bytes, not chars: think UTF8. */
+ _("warning: filenames truncated to 255 bytes.\n"));
+ if (warn_skip)
+ fprintf(stderr,
+ _("warning: files were skipped due to errors.\n"));
+ if (warn_size)
+ fprintf(stderr,
+ _("warning: file sizes truncated to %luMB "
+ "(minus 1 byte).\n"),
+ 1L << (CRAMFS_SIZE_WIDTH - 20));
+ if (warn_uid) /* (not possible with current Linux versions) */
+ fprintf(stderr,
+ _("warning: uids truncated to %u bits. "
+ "(This may be a security concern.)\n"),
+ CRAMFS_UID_WIDTH);
+ if (warn_gid)
+ fprintf(stderr,
+ _("warning: gids truncated to %u bits. "
+ "(This may be a security concern.)\n"),
+ CRAMFS_GID_WIDTH);
+ if (warn_dev)
+ fprintf(stderr,
+ _("WARNING: device numbers truncated to %u bits. "
+ "This almost certainly means\n"
+ "that some device files will be wrong.\n"),
+ CRAMFS_OFFSET_WIDTH);
+ if (opt_errors &&
+ (warn_namelen|warn_skip|warn_size|warn_uid|warn_gid|warn_dev))
+ exit(8);
+ return 0;
+}
diff --git a/fdisk/cfdisk.8 b/fdisk/cfdisk.8
index fc956d575..f46be0efe 100644
--- a/fdisk/cfdisk.8
+++ b/fdisk/cfdisk.8
@@ -419,6 +419,7 @@ command (above) for more information on the print formats.
3: cannot get geometry; 4: bad partition table on disk.
.SH "SEE ALSO"
.BR fdisk (8),
+.BR mkfs (8),
.BR parted (8),
.BR sfdisk (8)
.SH BUGS
diff --git a/fdisk/fdisk.8 b/fdisk/fdisk.8
index fda58057c..3ee111b40 100644
--- a/fdisk/fdisk.8
+++ b/fdisk/fdisk.8
@@ -227,5 +227,6 @@ The option `dump partition table to file' is missing.
.\" and many others.
.SH "SEE ALSO"
.BR cfdisk (8),
+.BR mkfs (8),
.BR parted (8),
.BR sfdisk (8)
diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index 8000bd27d..4d13678a3 100644
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
@@ -176,7 +176,8 @@ uint heads,
int sun_label = 0; /* looking at sun disklabel */
int sgi_label = 0; /* looking at sgi disklabel */
int aix_label = 0; /* looking at aix disklabel */
-int osf_label = 0; /* looking at osf disklabel */
+int osf_label = 0; /* looking at OSF/1 disklabel */
+int possibly_osf_label = 0;
jmp_buf listingbuf;
@@ -337,7 +338,7 @@ menu(void) {
puts(_(" w write table to disk and exit"));
puts(_(" x extra functionality (experts only)"));
}
- else if(sgi_label) {
+ else if (sgi_label) {
puts(_("Command action"));
puts(_(" a select bootable partition")); /* sgi flavour */
puts(_(" b edit bootfile entry")); /* sgi */
@@ -355,7 +356,7 @@ menu(void) {
puts(_(" v verify the partition table"));
puts(_(" w write table to disk and exit"));
}
- else if(aix_label) {
+ else if (aix_label) {
puts(_("Command action"));
puts(_(" m print this menu"));
puts(_(" o create a new empty DOS partition table"));
@@ -403,7 +404,7 @@ xmenu(void) {
puts(_(" w write table to disk and exit"));
puts(_(" y change number of physical cylinders")); /*sun*/
}
- else if(sgi_label) {
+ else if (sgi_label) {
puts(_("Command action"));
puts(_(" b move beginning of data in a partition")); /* !sun */
puts(_(" c change number of cylinders"));
@@ -419,7 +420,7 @@ xmenu(void) {
puts(_(" v verify the partition table"));
puts(_(" w write table to disk and exit"));
}
- else if(aix_label) {
+ else if (aix_label) {
puts(_("Command action"));
puts(_(" b move beginning of data in a partition")); /* !sun */
puts(_(" c change number of cylinders"));
@@ -710,7 +711,7 @@ create_doslabel(void) {
"content won't be recoverable.\n\n"));
sun_nolabel(); /* otherwise always recognised as sun */
sgi_nolabel(); /* otherwise always recognised as sgi */
- aix_label = osf_label = 0;
+ aix_label = osf_label = possibly_osf_label = 0;
partitions = 4;
for (i = 510-64; i < 510; i++)
@@ -856,6 +857,18 @@ get_boot(enum action what) {
partitions = 4;
+ for (i = 0; i < 4; i++) {
+ struct pte *pe = &ptes[i];
+
+ pe->part_table = pt_offset(MBRbuffer, i);
+ pe->ext_pointer = NULL;
+ pe->offset = 0;
+ pe->sectorbuffer = MBRbuffer;
+ pe->changed = (what == create_empty_dos);
+ }
+
+ memset(MBRbuffer, 0, 512);
+
if (what == create_empty_dos)
goto got_dos_table; /* skip reading disk */
if (what == create_empty_sun)
@@ -867,7 +880,8 @@ get_boot(enum action what) {
return 1;
fatal(unable_to_open);
} else
- printf(_("You will not be able to write the partition table.\n"));
+ printf(_("You will not be able to write "
+ "the partition table.\n"));
}
if (512 != read(fd, MBRbuffer, 512)) {
@@ -891,8 +905,15 @@ got_table:
if (check_aix_label())
return 0;
- if (check_osf_label())
- return 0;
+ if (check_osf_label()) {
+ possibly_osf_label = 1;
+ if (!valid_part_table_flag(MBRbuffer)) {
+ osf_label = 1;
+ return 0;
+ }
+ printf(_("This disk has both DOS and BSD magic.\n"
+ "Give the 'b' command to go to BSD mode.\n"));
+ }
got_dos_table:
@@ -900,8 +921,9 @@ got_dos_table:
switch(what) {
case fdisk:
fprintf(stderr,
- _("Device contains neither a valid DOS partition"
- " table, nor Sun, SGI or OSF disklabel\n"));
+ _("Device contains neither a valid DOS "
+ "partition table, nor Sun, SGI or OSF "
+ "disklabel\n"));
#ifdef __sparc__
create_sunlabel();
#else
@@ -927,16 +949,6 @@ got_dos_table:
for (i = 0; i < 4; i++) {
struct pte *pe = &ptes[i];
- pe->part_table = pt_offset(MBRbuffer, i);
- pe->ext_pointer = NULL;
- pe->offset = 0;
- pe->sectorbuffer = MBRbuffer;
- pe->changed = (what == create_empty_dos);
- }
-
- for (i = 0; i < 4; i++) {
- struct pte *pe = &ptes[i];
-
if (IS_EXTENDED (pe->part_table->sys_ind)) {
if (partitions != 4)
fprintf(stderr, _("Ignoring extra extended "
@@ -1229,7 +1241,7 @@ delete_partition(int i) {
/* the first logical in a longer chain */
struct pte *pe = &ptes[5];
- if(pe->part_table) /* prevent SEGFAULT */
+ if (pe->part_table) /* prevent SEGFAULT */
set_start_sect(pe->part_table,
get_partition_start(pe) -
extended_offset);
@@ -1450,7 +1462,7 @@ fix_chain_of_logicals(void) {
/* Stage 1: sort sectors but leave sector of part 4 */
/* (Its sector is the global extended_offset.) */
stage1:
- for(j = 5; j < partitions-1; j++) {
+ for (j = 5; j < partitions-1; j++) {
oj = ptes[j].offset;
ojj = ptes[j+1].offset;
if (oj > ojj) {
@@ -1470,7 +1482,7 @@ fix_chain_of_logicals(void) {
/* Stage 2: sort starting sectors */
stage2:
- for(j = 4; j < partitions-1; j++) {
+ for (j = 4; j < partitions-1; j++) {
pj = ptes[j].part_table;
pjj = ptes[j+1].part_table;
sj = get_start_sect(pj);
@@ -1488,7 +1500,7 @@ fix_chain_of_logicals(void) {
}
/* Probably something was changed */
- for(j = 4; j < partitions; j++)
+ for (j = 4; j < partitions; j++)
ptes[j].changed = 1;
}
@@ -1497,7 +1509,7 @@ fix_partition_table_order(void) {
struct pte *pei, *pek;
int i,k;
- if(!wrong_p_order(NULL)) {
+ if (!wrong_p_order(NULL)) {
printf(_("Nothing to do. Ordering is correct already.\n\n"));
return;
}
@@ -1957,7 +1969,7 @@ write_table(void) {
if (dos_label) {
for (i=0; i<3; i++)
- if(ptes[i].changed)
+ if (ptes[i].changed)
ptes[3].changed = 1;
for (i = 3; i < partitions; i++) {
struct pte *pe = &ptes[i];
@@ -1975,7 +1987,7 @@ write_table(void) {
int needw = 0;
for (i=0; i<8; i++)
- if(ptes[i].changed)
+ if (ptes[i].changed)
needw = 1;
if (needw)
sun_write_table();
@@ -2001,7 +2013,7 @@ reread_partition_table(int leave) {
twice, the second time works. - biro@yggdrasil.com */
sync();
sleep(2);
- if((i = ioctl(fd, BLKRRPART)) != 0)
+ if ((i = ioctl(fd, BLKRRPART)) != 0)
error = errno;
}
@@ -2123,7 +2135,7 @@ xselect(void) {
x_list_table(1);
break;
case 'f':
- if(dos_label)
+ if (dos_label)
fix_partition_table_order();
break;
case 'g':
@@ -2247,7 +2259,7 @@ try(char *device, int user_specified) {
/* Ignore other errors, since we try IDE
and SCSI hard disks which may not be
installed on the system. */
- if(errno == EACCES) {
+ if (errno == EACCES) {
fprintf(stderr, _("Cannot open %s\n"), device);
return;
}
@@ -2272,7 +2284,7 @@ tryprocpt(void) {
if (sscanf (line, " %d %d %d %[^\n ]",
&ma, &mi, &sz, ptname) != 4)
continue;
- for(s = ptname; *s; s++);
+ for (s = ptname; *s; s++);
if (isdigit(s[-1]))
continue;
snprintf(devname, sizeof(devname), "/dev/%s", ptname);
@@ -2336,7 +2348,8 @@ main(int argc, char **argv) {
}
#if 0
- printf(_("This kernel finds the sector size itself - -b option ignored\n"));
+ printf(_("This kernel finds the sector size itself - "
+ "-b option ignored\n"));
#else
if (user_set_sector_size && argc-optind != 1)
printf(_("Warning: the -b (set sector size) option should"
@@ -2352,7 +2365,7 @@ main(int argc, char **argv) {
variable `k' might be clobbered by `longjmp' */
dummy(&k);
listing = 1;
- for(k=optind; k<argc; k++)
+ for (k=optind; k<argc; k++)
try(argv[k], 1);
} else {
/* we no longer have default device names */
@@ -2396,18 +2409,16 @@ main(int argc, char **argv) {
get_boot(fdisk);
-#ifdef __alpha__
- /* On alpha, if we detect a disklabel, go directly to
- disklabel mode (typically you'll be switching from DOS
- partition tables to disklabels, not the other way around)
- - dhuggins@linuxcare.com */
if (osf_label) {
- printf(_("Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
- "To return to DOS partition table mode, use the 'r' command.\n"),
+ /* OSF label, and no DOS label */
+ printf(_("Detected an OSF/1 disklabel on %s, entering "
+ "disklabel mode.\n"),
disk_device);
bselect();
+ osf_label = 0;
+ /* If we return we may want to make an empty DOS label? */
}
-#endif
+
while (1) {
putchar('\n');
c = tolower(read_char(_("Command (m for help): ")));
@@ -2492,7 +2503,7 @@ main(int argc, char **argv) {
write_table(); /* does not return */
break;
case 'x':
- if(sgi_label) {
+ if (sgi_label) {
fprintf(stderr,
_("\n\tSorry, no experts menu for SGI "
"partition tables available.\n\n"));
diff --git a/fdisk/fdiskbsdlabel.c b/fdisk/fdiskbsdlabel.c
index 60029b919..435541df2 100644
--- a/fdisk/fdiskbsdlabel.c
+++ b/fdisk/fdiskbsdlabel.c
@@ -38,8 +38,8 @@
19990319 - Arnaldo Carvalho de Melo <acme@conectiva.com.br> - i18n/nls
20000101 - David Huggins-Daines <dhuggins@linuxcare.com> - Better
- support for OSF/1 disklabels on Alpha. Also fixed unaligned
- accesses in alpha_bootblock_checksum()
+ support for OSF/1 disklabels on Alpha.
+ Also fixed unaligned accesses in alpha_bootblock_checksum()
*/
#include <unistd.h>
@@ -73,7 +73,8 @@ static int xbsd_get_part_index (int max);
static int xbsd_check_new_partition (int *i);
static void xbsd_list_types (void);
static u_short xbsd_dkcksum (struct xbsd_disklabel *lp);
-static int xbsd_initlabel (struct partition *p, struct xbsd_disklabel *d, int pindex);
+static int xbsd_initlabel (struct partition *p, struct xbsd_disklabel *d,
+ int pindex);
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);
@@ -101,22 +102,26 @@ static struct xbsd_disklabel xbsd_dlabel;
#define bsd_cround(n) \
(display_in_cyl_units ? ((n)/xbsd_dlabel.d_secpercyl) + 1 : (n))
+/*
+ * Test whether the whole disk has BSD disk label magic.
+ *
+ * Note: often reformatting with DOS-type label leaves the BSD magic,
+ * so this does not mean that there is a BSD disk label.
+ */
int
check_osf_label(void) {
- osf_label = 0;
- if (xbsd_readlabel (NULL, &xbsd_dlabel) == 0)
- return 0;
- osf_label = 1;
- return 1;
+ if (xbsd_readlabel (NULL, &xbsd_dlabel) == 0)
+ return 0;
+ return 1;
}
int
btrydev (char * dev) {
- if (xbsd_readlabel (NULL, &xbsd_dlabel) == 0)
- return -1;
- printf(_("\nBSD label for device: %s\n"), dev);
- xbsd_print_disklabel (0);
- return 0;
+ if (xbsd_readlabel (NULL, &xbsd_dlabel) == 0)
+ return -1;
+ printf(_("\nBSD label for device: %s\n"), dev);
+ xbsd_print_disklabel (0);
+ return 0;
}
static void
@@ -598,152 +603,159 @@ xbsd_get_part_index (int max)
}
static int
-xbsd_check_new_partition (int *i)
-{
- int t;
+xbsd_check_new_partition (int *i) {
- if (xbsd_dlabel.d_npartitions == BSD_MAXPARTITIONS)
- {
- for (t=0; t < BSD_MAXPARTITIONS; t++)
- if (xbsd_dlabel.d_partitions[t].p_size == 0)
- break;
+ /* room for more? various BSD flavours have different maxima */
+ if (xbsd_dlabel.d_npartitions == BSD_MAXPARTITIONS) {
+ int t;
- if (t == BSD_MAXPARTITIONS)
- {
- fprintf (stderr, _("The maximum number of partitions has been created\n"));
- return 0;
- }
- }
- *i = xbsd_get_part_index (BSD_MAXPARTITIONS);
+ for (t = 0; t < BSD_MAXPARTITIONS; t++)
+ if (xbsd_dlabel.d_partitions[t].p_size == 0)
+ break;
- if (*i >= xbsd_dlabel.d_npartitions)
- xbsd_dlabel.d_npartitions = (*i) + 1;
+ if (t == BSD_MAXPARTITIONS) {
+ fprintf (stderr, _("The maximum number of partitions "
+ "has been created\n"));
+ return 0;
+ }
+ }
- if (xbsd_dlabel.d_partitions[*i].p_size != 0)
- {
- fprintf (stderr, _("This partition already exists.\n"));
- return 0;
- }
- return 1;
+ *i = xbsd_get_part_index (BSD_MAXPARTITIONS);
+
+ if (*i >= xbsd_dlabel.d_npartitions)
+ xbsd_dlabel.d_npartitions = (*i) + 1;
+
+ if (xbsd_dlabel.d_partitions[*i].p_size != 0) {
+ fprintf (stderr, _("This partition already exists.\n"));
+ return 0;
+ }
+
+ return 1;
}
static void
-xbsd_list_types (void)
-{
- list_types (xbsd_fstypes);
+xbsd_list_types (void) {
+ list_types (xbsd_fstypes);
}
static u_short
-xbsd_dkcksum (struct xbsd_disklabel *lp)
-{
- register u_short *start, *end;
- register u_short sum = 0;
+xbsd_dkcksum (struct xbsd_disklabel *lp) {
+ u_short *start, *end;
+ u_short sum = 0;
- start = (u_short *)lp;
- end = (u_short *)&lp->d_partitions[lp->d_npartitions];
- while (start < end)
- sum ^= *start++;
- return (sum);
+ start = (u_short *) lp;
+ end = (u_short *) &lp->d_partitions[lp->d_npartitions];
+ while (start < end)
+ sum ^= *start++;
+ return sum;
}
static int
-xbsd_initlabel (struct partition *p, struct xbsd_disklabel *d, int pindex)
-{
- struct xbsd_partition *pp;
- struct geom g;
+xbsd_initlabel (struct partition *p, struct xbsd_disklabel *d, int pindex) {
+ struct xbsd_partition *pp;
+ struct geom g;
- get_geometry (fd, &g);
- bzero (d, sizeof (struct xbsd_disklabel));
+ get_geometry (fd, &g);
+ bzero (d, sizeof (struct xbsd_disklabel));
- d -> d_magic = BSD_DISKMAGIC;
+ d -> d_magic = BSD_DISKMAGIC;
- if (strncmp (disk_device, "/dev/sd", 7) == 0)
- d -> d_type = BSD_DTYPE_SCSI;
- else
- d -> d_type = BSD_DTYPE_ST506;
+ if (strncmp (disk_device, "/dev/sd", 7) == 0)
+ d -> d_type = BSD_DTYPE_SCSI;
+ else
+ d -> d_type = BSD_DTYPE_ST506;
#if 0 /* not used (at least not written to disk) by NetBSD/i386 1.0 */
- d -> d_subtype = BSD_DSTYPE_INDOSPART & pindex;
+ d -> d_subtype = BSD_DSTYPE_INDOSPART & pindex;
#endif
#if !defined (__alpha__)
- d -> d_flags = BSD_D_DOSPART;
+ d -> d_flags = BSD_D_DOSPART;
#else
- d -> d_flags = 0;
+ d -> d_flags = 0;
#endif
- d -> d_secsize = SECTOR_SIZE; /* bytes/sector */
- d -> d_nsectors = g.sectors; /* sectors/track */
- d -> d_ntracks = g.heads; /* tracks/cylinder (heads) */
- d -> d_ncylinders = g.cylinders;
- d -> d_secpercyl = g.sectors * g.heads; /* sectors/cylinder */
- if (d -> d_secpercyl == 0)
- d -> d_secpercyl = 1; /* avoid segfaults */
- d -> d_secperunit = d -> d_secpercyl * d -> d_ncylinders;
-
- d -> d_rpm = 3600;
- d -> d_interleave = 1;
- d -> d_trackskew = 0;
- d -> d_cylskew = 0;
- d -> d_headswitch = 0;
- d -> d_trkseek = 0;
-
- d -> d_magic2 = BSD_DISKMAGIC;
- d -> d_bbsize = BSD_BBSIZE;
- d -> d_sbsize = BSD_SBSIZE;
+ d -> d_secsize = SECTOR_SIZE; /* bytes/sector */
+ d -> d_nsectors = g.sectors; /* sectors/track */
+ d -> d_ntracks = g.heads; /* tracks/cylinder (heads) */
+ d -> d_ncylinders = g.cylinders;
+ d -> d_secpercyl = g.sectors * g.heads;/* sectors/cylinder */
+ if (d -> d_secpercyl == 0)
+ d -> d_secpercyl = 1; /* avoid segfaults */
+ d -> d_secperunit = d -> d_secpercyl * d -> d_ncylinders;
+
+ d -> d_rpm = 3600;
+ d -> d_interleave = 1;
+ d -> d_trackskew = 0;
+ d -> d_cylskew = 0;
+ d -> d_headswitch = 0;
+ d -> d_trkseek = 0;
+
+ d -> d_magic2 = BSD_DISKMAGIC;
+ d -> d_bbsize = BSD_BBSIZE;
+ d -> d_sbsize = BSD_SBSIZE;
#if !defined (__alpha__)
- d -> d_npartitions = 4;
- pp = &d -> d_partitions[2]; /* Partition C should be the NetBSD partition */
- pp -> p_offset = get_start_sect(p);
- pp -> p_size = get_nr_sects(p);
- pp -> p_fstype = BSD_FS_UNUSED;
- pp = &d -> d_partitions[3]; /* Partition D should be the whole disk */
- pp -> p_offset = 0;
- pp -> p_size = d -> d_secperunit;
- pp -> p_fstype = BSD_FS_UNUSED;
+ d -> d_npartitions = 4;
+ pp = &d -> d_partitions[2]; /* Partition C should be
+ the NetBSD partition */
+ pp -> p_offset = get_start_sect(p);
+ pp -> p_size = get_nr_sects(p);
+ pp -> p_fstype = BSD_FS_UNUSED;
+ pp = &d -> d_partitions[3]; /* Partition D should be
+ the whole disk */
+ pp -> p_offset = 0;
+ pp -> p_size = d -> d_secperunit;
+ pp -> p_fstype = BSD_FS_UNUSED;
#elif defined (__alpha__)
- d -> d_npartitions = 3;
- pp = &d -> d_partitions[2]; /* Partition C should be the whole disk */
- pp -> p_offset = 0;
- pp -> p_size = d -> d_secperunit;
- pp -> p_fstype = BSD_FS_UNUSED;
+ d -> d_npartitions = 3;
+ pp = &d -> d_partitions[2]; /* Partition C should be
+ the whole disk */
+ pp -> p_offset = 0;
+ pp -> p_size = d -> d_secperunit;
+ pp -> p_fstype = BSD_FS_UNUSED;
#endif
- return 1;
+ return 1;
}
+/*
+ * Read a xbsd_disklabel from sector 0 or from the starting sector of p.
+ * If it has the right magic, return 1.
+ */
static int
xbsd_readlabel (struct partition *p, struct xbsd_disklabel *d)
{
- int t, sector;
+ int t, sector;
+ /* p is used only to get the starting sector */
#if !defined (__alpha__)
- sector = (p ? get_start_sect(p) : 0);
+ sector = (p ? get_start_sect(p) : 0);
#elif defined (__alpha__)
- sector = 0;
+ sector = 0;
#endif
- if (ext2_llseek (fd, (ext2_loff_t) sector * SECTOR_SIZE, SEEK_SET) == -1)
- fatal (unable_to_seek);
- if (BSD_BBSIZE != read (fd, disklabelbuffer, BSD_BBSIZE))
- fatal (unable_to_read);
+ if (ext2_llseek (fd, (ext2_loff_t) sector * SECTOR_SIZE, SEEK_SET) == -1)
+ fatal (unable_to_seek);
+ if (BSD_BBSIZE != read (fd, disklabelbuffer, BSD_BBSIZE))
+ fatal (unable_to_read);
- bcopy (&disklabelbuffer[BSD_LABELSECTOR * SECTOR_SIZE + BSD_LABELOFFSET],
- d, sizeof (struct xbsd_disklabel));
+ bcopy (&disklabelbuffer[BSD_LABELSECTOR * SECTOR_SIZE + BSD_LABELOFFSET],
+ d, sizeof (struct xbsd_disklabel));
- for (t = d -> d_npartitions; t < BSD_MAXPARTITIONS; t++)
- {
- d -> d_partitions[t].p_size = 0;
- d -> d_partitions[t].p_offset = 0;
- d -> d_partitions[t].p_fstype = BSD_FS_UNUSED;
- }
- if (d -> d_magic != BSD_DISKMAGIC || d -> d_magic2 != BSD_DISKMAGIC)
- return 0;
+ if (d -> d_magic != BSD_DISKMAGIC || d -> d_magic2 != BSD_DISKMAGIC)
+ return 0;
- if (d -> d_npartitions > BSD_MAXPARTITIONS)
- fprintf (stderr, _("Warning: too many partitions (%d, maximum is %d).\n"),
- d -> d_npartitions, BSD_MAXPARTITIONS);
- return 1;
+ for (t = d -> d_npartitions; t < BSD_MAXPARTITIONS; t++) {
+ d -> d_partitions[t].p_size = 0;
+ d -> d_partitions[t].p_offset = 0;
+ d -> d_partitions[t].p_fstype = BSD_FS_UNUSED;
+ }
+
+ if (d -> d_npartitions > BSD_MAXPARTITIONS)
+ fprintf (stderr, _("Warning: too many partitions "
+ "(%d, maximum is %d).\n"),
+ d -> d_npartitions, BSD_MAXPARTITIONS);
+ return 1;
}
static int
diff --git a/fdisk/fdiskbsdlabel.h b/fdisk/fdiskbsdlabel.h
index 2421585e4..279733e86 100644
--- a/fdisk/fdiskbsdlabel.h
+++ b/fdisk/fdiskbsdlabel.h
@@ -33,12 +33,12 @@
#include <linux/types.h> /* for __u32, __u16, __u8, __s16 */
-#ifndef BSD_DISKMAGIC /* perhaps from <linux/genhd.h> */
+#ifndef BSD_DISKMAGIC
#define BSD_DISKMAGIC ((__u32) 0x82564557)
#endif
#ifndef BSD_MAXPARTITIONS
-#define BSD_MAXPARTITIONS 8
+#define BSD_MAXPARTITIONS 16
#endif
#define BSD_LINUX_BOOTDIR "/usr/ucb/mdec"
diff --git a/fdisk/fdisksunlabel.c b/fdisk/fdisksunlabel.c
index 0036c1094..25f07b52c 100644
--- a/fdisk/fdisksunlabel.c
+++ b/fdisk/fdisksunlabel.c
@@ -678,8 +678,8 @@ sun_list_table(int xtra) {
__u32 start = SSWAP32(sunlabel->partitions[i].start_cylinder) * heads * sectors;
__u32 len = SSWAP32(sunlabel->partitions[i].num_sectors);
printf(
- "%*s%-2d %c%c %9ld %9ld %9ld%c %2x %s\n",
-/* device */ w, disk_device, i + 1,
+ "%s %c%c %9ld %9ld %9ld%c %2x %s\n",
+/* device */ partname(disk_device, i+1, w),
/* flags */ (sunlabel->infos[i].flags & 0x01) ? 'u' : ' ',
(sunlabel->infos[i].flags & 0x10) ? 'r' : ' ',
/* start */ (long) scround(start),
diff --git a/fdisk/partname.c b/fdisk/partname.c
index b09b958a2..e4bc42bcd 100644
--- a/fdisk/partname.c
+++ b/fdisk/partname.c
@@ -33,9 +33,10 @@ partnamebf(char *dev, int pno, int lth, int bufsiz, char *bufp) {
wp = strlen(p);
if (lth) {
- sprintf(bufp, "%*.*s%s%-2u", lth-wp-2, w, dev, p, pno);
+ snprintf(bufp, bufsiz, "%*.*s%s%-2u",
+ lth-wp-2, w, dev, p, pno);
} else {
- sprintf(bufp, "%.*s%s%-2u", w, dev, p, pno);
+ snprintf(bufp, bufsiz, "%.*s%s%-2u", w, dev, p, pno);
}
return bufp;
}
diff --git a/fdisk/sfdisk.8 b/fdisk/sfdisk.8
index c7b152e74..4947e2c4a 100644
--- a/fdisk/sfdisk.8
+++ b/fdisk/sfdisk.8
@@ -521,4 +521,5 @@ A. E. Brouwer (aeb@cwi.nl)
.SH "SEE ALSO"
.BR cfdisk (8),
.BR fdisk (8),
+.BR mkfs (8),
.BR parted (8)
diff --git a/fdisk/sfdisk.c b/fdisk/sfdisk.c
index a35490283..52ebce52a 100644
--- a/fdisk/sfdisk.c
+++ b/fdisk/sfdisk.c
@@ -1367,7 +1367,7 @@ extended_partition(char *dev, int fd, struct part_desc *ep, struct disk_desc *z)
}
#define BSD_DISKMAGIC (0x82564557UL)
-#define BSD_MAXPARTITIONS 8
+#define BSD_MAXPARTITIONS 16
#define BSD_FS_UNUSED 0
typedef unsigned char u8;
typedef unsigned short u16;
@@ -1404,11 +1404,11 @@ bsd_partition(char *dev, int fd, struct part_desc *ep, struct disk_desc *z) {
if (!(s = get_sector(dev,fd,start+1)))
return;
l = (struct bsd_disklabel *) (s->data);
- if (l->d_magic != BSD_DISKMAGIC)
+ if (l->d_magic != BSD_DISKMAGIC || l->d_magic2 != BSD_DISKMAGIC)
return;
bp = bp0 = &l->d_partitions[0];
- while (bp - bp0 <= BSD_MAXPARTITIONS) {
+ while (bp - bp0 < BSD_MAXPARTITIONS && bp - bp0 < l->d_npartitions) {
if (pno+1 >= SIZE(z->partitions)) {
printf(_("too many partitions - ignoring those "
"past nr (%d)\n"), pno-1);
diff --git a/hwclock/Makefile b/hwclock/Makefile
index 70ff6436c..88aa50cd8 100644
--- a/hwclock/Makefile
+++ b/hwclock/Makefile
@@ -16,9 +16,9 @@ SBIN= hwclock
all: $(SBIN)
-hwclock.o: hwclock.c shhopt.h
+hwclock.o: hwclock.c
hwclock.o cmos.o rtc.o kd.o: clock.h
-hwclock: hwclock.o shhopt.o cmos.o rtc.o kd.o
+hwclock: hwclock.o cmos.o rtc.o kd.o
CWFLAGS := $(subst -Wmissing-prototypes,,$(CFLAGS))
diff --git a/hwclock/README.aeb b/hwclock/README.aeb
deleted file mode 100644
index 3955f9050..000000000
--- a/hwclock/README.aeb
+++ /dev/null
@@ -1,9 +0,0 @@
-This directory contains the hwclock stuff as fixed by me.
-It should work on all architectures.
-
-Bryan has backported my changes to his original source,
-so the present directory should be superfluous -
-however, his code fails on my Sparc.
-Will look at it later.
-
-Andries Brouwer - aeb@cwi.nl
diff --git a/hwclock/README.shhopt-1.1 b/hwclock/README.shhopt-1.1
deleted file mode 100644
index 766d6cbdc..000000000
--- a/hwclock/README.shhopt-1.1
+++ /dev/null
@@ -1,155 +0,0 @@
-shhopt - library for parsing command line options.
-==================================================
-
-This is a set of functions for parsing command line options. Both
-traditional one-character options, and GNU-style --long-options are
-supported.
-
-
-What separates this from traditional getopt?
---------------------------------------------
-
-This library does more of the parsing for you. You set up a special
-structure describing the names and types of the options you want your
-program to support. In the structure you also give addresses of
-variables to update or functions to call for the various
-options. By calling optParseOptions, all options in argv are parsed
-and removed from argv. What is left, are the non-optional arguments to
-your program.
-
-The down-side of this, is that you won't be able to make a program
-where the position of the options between the non-options are
-significant.
-
-
-Usage
------
-
-To see how to use this library, take a look at the sample program
-example.c.
-
-A brief explanation:
-
-To parse your command line, you need to create and initialize an array
-of optStruct's. Each element in the array describes a long and short
-version of an option and specifies what type of option it is and how
-to handle it.
-
-The structure fields (see also shhopt.h):
-
- `shortName' is the short option name without the leading '-'.
-
- `longName' is the long option name without the leading "--".
-
- `type' specifies what type of option this is. (Does it expect an
- argument? Is it a flag? If it takes an argument,what type should
- it be?)
-
- `arg' is either a function to be called with the argument from
- the commandline, or a pointer to a location in which to store
- the value.
-
- `flags' indicates whether `arg' points to a function or a storage
- location.
-
-The different argument types:
-
- `OPT_END' flags this as the last element in the options array.
-
- `OPT_FLAG' indicates an option that takes no arguments. If `arg' is
- not a function pointer, the value of `arg' will be set to 1 if
- this flag is found on the command line.
-
- `OPT_STRING' expects a string argument.
-
- `OPT_INT' expects an int argument.
-
- `OPT_UINT' expects an unsigned int argument.
-
- `OPT_LONG' expects a long argument.
-
- `OPT_ULONG' expects an unsigned long argument.
-
-The different flag types:
-
- `OPT_CALLFUNC' indicates that `arg' is a function pointer. If this
- is not given, `arg' is taken as a pointer to a variable.
-
-
-Notes
------
-
-* A dash (`-') by itself is not taken as any kind of an option, as
- several programs use this to indicate the special files stdin and
- stdout. It is thus left as a normal argument to the program.
-
-* Two dashes (`--') as an argument, is taken to mean that the rest of
- the arguments should not be scanned for options. This simplifies
- giving names of files that start with a dash.
-
-* Short (one-character) options accept parameters in two ways, either
- directly following the option in the same argv-entry, or in the next
- argv-entry:
-
- -sPARAMETER
- -s PARAMETER
-
-* Long options accept parameters in two ways:
-
- --long-option=PARAMETER
- --long-option PARAMETER
-
- To follow the GNU-tradition, your program documentation should use
- the first form.
-
-* Several one-character options may be combined after a single
- dash. If any of the options requires a parameter, the rest of the
- string is taken as this parameter. If there is no "rest of the
- string", the next argument is taken as the parameter.
-
-* There is no support for floating point (double) arguments to
- options. This is to avoid unnecessary linking with the math
- library. See example.c for how to get around this by writing a
- function converting a string argument to a double.
-
-
-Portability
------------
-
-If your libc lacks strtoul, you will need to link with GNU's -liberty,
-that may be found by anonymous ftp to prep.ai.mit.edu:/pub/gnu
-
-The library has (more or less recently) been compiled and `tested' on
-the following systems:
-
- IRIX Release 5.3 IP22
- Linux 1.2.9
- SunOS Release 4.1.3_U1 (-liberty needed)
- ULTRIX V4.4 (Rev. 69)
-
-All compilations were done using GNU's gcc, and GNU's make.
-
-
-Author
-------
-
-The program is written by
-
- Sverre H. Huseby
- Maridalsvn. 122, leil. 101
- N-0461 Oslo
- Norway
-
- sverrehu@ifi.uio.no
- http://www.ifi.uio.no/~sverrehu/
-
-You can use and copy this for free. If you decide to use it, please do
-me three small favours:
-
- 1. Tell me! (E-mail, postcard, letter, whatever. If you wish
- to give me something, please send a bottle of your
- favourite beer (making this BeerWare))
- 2. Let your friends and favourite download site have a copy!
- (with all files intact, please..)
- 3. Report any bugs you find!
-
diff --git a/hwclock/adjtime.patch b/hwclock/adjtime.patch
deleted file mode 100644
index 81d0430fd..000000000
--- a/hwclock/adjtime.patch
+++ /dev/null
@@ -1,302 +0,0 @@
-From ao112@rgfn.epcc.edu Fri Mar 19 06:27:26 1999
-Received: from rgfn.epcc.edu (rgfn.epcc.edu [208.136.234.19]) by hera.cwi.nl with ESMTP
- id GAA27711 for <Andries.Brouwer@cwi.nl>; Fri, 19 Mar 1999 06:27:23 +0100 (MET)
-Received: (from ao112@localhost)
- by rgfn.epcc.edu (8.8.8/8.8.8) id WAA16797;
- Thu, 18 Mar 1999 22:27:19 -0700 (MST)
-Date: Thu, 18 Mar 1999 22:27:19 -0700 (MST)
-Message-Id: <199903190527.WAA16797@rgfn.epcc.edu>
-From: ao112@rgfn.epcc.edu (James P. Rutledge)
-To: Andries.Brouwer@cwi.nl
-Subject: Re: hwclock patch for drift_factor calculation improvement
-Reply-To: ao112@rgfn.epcc.edu
-Status: R
-
-
-
->
->Could you perhaps make your patch relative to
->util-linux-2.9n (found in ftp.cwi.nl/pub/aeb/util-linux/util-linux-2.9n.tar.gz)
->?
->
->(The hwclock stuff has changed quite a bit since 2.9g.)
->
->Andries
->
-
-Andries;
-
-Per your request, the patch has been modified for util-linux version
-2.9n, from the version for 2.9g.
-
-The program "hwclock" (version 2.4c) could give more accurate
-values for the drift factor that it places in the file "/etc/adjtime".
-
-A patch to improve the accuracy is included.
-
-I have incorporated some error sources which were not compensated
-for into the drift factor calculation (performed when the "--set"
-or the "--systohc" option is used) to make it more accurate.
-In particular, the sync delay between the desired set time and the
-start of the hardware clock second, and the expected drift since the
-last hardware clock adjustment are now accounted for in the drift
-factor calculation.
-
-With this patch, if at any time an adjust operation is attempted and
-the hardware clock is found to be not valid, then the calibration
-and adjustment time is set to zero to insure that if the hardware
-clock should coincidentally return to validity, a calibration is not
-done with bad history data (hardware clock info bad) and an adjust is
-not attempted on bad (but now passing validity test) hardware clock
-data. (With this patch, a previous calibration time of zero causes
-the calibration time to initialize with the current time, when the
-hardware clock is set, but no change is made to the drift factor,
-so in effect, an initial calibration is started over while the previous
-drift factor is retained.)
-
-Also, the behavior in the case of an initially missing "/etc/adjtime"
-file or such a file produced by the predecessor "clock" program has
-been slightly improved as follows:
-
- With this patch, if the file exists but was produced by "clock"
- and, thus, is given a zero calibration time, the drift factor is
- not updated upon the first calibration by "hwclock", but is left alone
- and is only changed by subsequent calibrations.
-
- With this patch, if the file does not exist and, thus, is given
- a zero calibration time, the drift factor is set to zero upon the
- first calibration by "hwclock" and is then changed, as appropriate, by
- subsequent calibrations.
-
- Also, with this patch, an "--adjust" operation against a non-existent
- "/etc/adjtime" file or one which has zero as the last adjustment
- time will not change the hardware clock setting.
-
-A context diff for a patch to the file "hwclock.c" in the directory
-"util-linux-2.9n/clock" is appended.
-To use the patch, "cd" to the directory "util-linux-2.9n/clock".
-Run "patch < bug-report", where "bug-report" is the file name of
-this mail message, to get new file "hwclock.c" which contains the proposed
-new version. This patch is, of course, submitted per the GPL and the
-appropriate "NO WARRANTY OF ANY KIND" and "USE AT YOUR OWN RISK"
-disclaimers apply.
-
-Note that the patch presumptuously changes the "hwclock.c" version
-number from 2.4c to 2.4c1 in "hwclock.c".
-
-Jim
-
------------------- Patch file follows ----------------------------
-*** hwclock.c Thu Mar 18 22:04:01 1999
---- new-hwclock.c Thu Mar 18 22:03:18 1999
-***************
-*** 76,86 ****
-
- #include "clock.h"
- #include "../version.h"
-
- #define MYNAME "hwclock"
-! #define VERSION "2.4c"
-
- char *progname = MYNAME;
-
- /* The struct that holds our hardware access routines */
- struct clock_ops *ur;
---- 76,86 ----
-
- #include "clock.h"
- #include "../version.h"
-
- #define MYNAME "hwclock"
-! #define VERSION "2.4c1"
-
- char *progname = MYNAME;
-
- /* The struct that holds our hardware access routines */
- struct clock_ops *ur;
-***************
-*** 581,601 ****
-
-
- static void
- adjust_drift_factor(struct adjtime *adjtime_p,
- const time_t nowtime,
-! const bool hclock_valid, const time_t hclocktime ) {
- /*---------------------------------------------------------------------------
- Update the drift factor in <*adjtime_p> to reflect the fact that the
- Hardware Clock was calibrated to <nowtime> and before that was set
- to <hclocktime>.
-
-- We assume that the user has been doing regular drift adjustments
-- using the drift factor in the adjtime file, so if <nowtime> and
-- <clocktime> are different, that means the adjustment factor isn't
-- quite right.
--
- We record in the adjtime file the time at which we last calibrated
- the clock so we can compute the drift rate each time we calibrate.
-
- EXCEPT: if <hclock_valid> is false, assume Hardware Clock was not set
- before to anything meaningful and regular adjustments have not been
---- 581,598 ----
-
-
- static void
- adjust_drift_factor(struct adjtime *adjtime_p,
- const time_t nowtime,
-! const bool hclock_valid,
-! const time_t hclocktime,
-! const float sync_delay ) {
- /*---------------------------------------------------------------------------
- Update the drift factor in <*adjtime_p> to reflect the fact that the
- Hardware Clock was calibrated to <nowtime> and before that was set
- to <hclocktime>.
-
- We record in the adjtime file the time at which we last calibrated
- the clock so we can compute the drift rate each time we calibrate.
-
- EXCEPT: if <hclock_valid> is false, assume Hardware Clock was not set
- before to anything meaningful and regular adjustments have not been
-***************
-*** 604,629 ****
- ----------------------------------------------------------------------------*/
- if (!hclock_valid) {
- if (debug)
- printf("Not adjusting drift factor because the Hardware Clock "
- "previously contained garbage.\n");
- } else if ((hclocktime - adjtime_p->last_calib_time) < 23 * 60 * 60) {
- if (debug)
- printf("Not adjusting drift factor because it has been less than a "
- "day since the last calibration.\n");
- } else {
-! const float factor_adjust =
-! ((float) (nowtime - hclocktime)
-! / (hclocktime - adjtime_p->last_calib_time))
-! * 24 * 60 * 60;
-
- if (debug)
-! printf("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",
-! (int) (nowtime - hclocktime),
-! (int) (hclocktime - adjtime_p->last_calib_time),
- adjtime_p->drift_factor,
- factor_adjust );
-
- adjtime_p->drift_factor += factor_adjust;
- }
---- 601,642 ----
- ----------------------------------------------------------------------------*/
- 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 last calibration "
-+ "time is zero,\nso history is bad and calibration startover "
-+ "is necessary.\n");
- } else if ((hclocktime - adjtime_p->last_calib_time) < 23 * 60 * 60) {
- 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 = (float)(hclocktime - adjtime_p->last_adj_time) / sec_per_day;
-! exp_drift = adj_days * adjtime_p->drift_factor + adjtime_p->not_adjusted;
-! unc_drift = (float)(nowtime - hclocktime) + sync_delay - 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 (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) (nowtime - adjtime_p->last_calib_time),
- adjtime_p->drift_factor,
- factor_adjust );
-
- adjtime_p->drift_factor += factor_adjust;
- }
-***************
-*** 764,773 ****
---- 777,794 ----
-
- ----------------------------------------------------------------------------*/
- if (!hclock_valid) {
- fprintf(stderr, "The Hardware Clock does not contain a valid time, "
- "so we cannot adjust it.\n");
-+ adjtime_p->last_calib_time = 0; /* calibration startover is required */
-+ 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 setting clock because last adjustment time is zero, "
-+ "so history is bad.");
- } 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
-***************
-*** 878,888 ****
- time_diff(read_time, startup_time));
- *retcode_p = 0;
- } else if (set) {
- set_hardware_clock_exact(set_time, startup_time,
- universal, testing);
-! adjust_drift_factor(&adjtime, set_time, hclock_valid, hclocktime);
- *retcode_p = 0;
- } else if (adjust) {
- do_adjustment(&adjtime, hclock_valid, hclocktime,
- read_time, universal, testing);
- *retcode_p = 0;
---- 899,910 ----
- time_diff(read_time, startup_time));
- *retcode_p = 0;
- } else if (set) {
- set_hardware_clock_exact(set_time, startup_time,
- universal, testing);
-! adjust_drift_factor(&adjtime, set_time, hclock_valid, hclocktime,
-! time_diff(read_time, startup_time));
- *retcode_p = 0;
- } else if (adjust) {
- do_adjustment(&adjtime, hclock_valid, hclocktime,
- read_time, universal, testing);
- *retcode_p = 0;
-***************
-*** 898,908 ****
-
- set_hardware_clock_exact((time_t) reftime.tv_sec, reftime,
- universal, testing);
- *retcode_p = 0;
- adjust_drift_factor(&adjtime, (time_t) reftime.tv_sec, hclock_valid,
-! hclocktime);
- } else if (hctosys) {
- rc = set_system_clock(hclock_valid, hclocktime, testing);
- if (rc != 0) {
- printf("Unable to set system clock.\n");
- *retcode_p = 1;
---- 920,930 ----
-
- set_hardware_clock_exact((time_t) reftime.tv_sec, reftime,
- universal, testing);
- *retcode_p = 0;
- adjust_drift_factor(&adjtime, (time_t) reftime.tv_sec, hclock_valid,
-! hclocktime, (float)(read_time.tv_usec / 1E6));
- } else if (hctosys) {
- rc = set_system_clock(hclock_valid, hclocktime, testing);
- if (rc != 0) {
- printf("Unable to set system clock.\n");
- *retcode_p = 1;
-
diff --git a/hwclock/cmos.c b/hwclock/cmos.c
index aed122cb1..a5eec0372 100644
--- a/hwclock/cmos.c
+++ b/hwclock/cmos.c
@@ -65,15 +65,18 @@ int inb(int c){ return 0; }
#define BCD_TO_BIN(val) ((val)=((val)&15) + ((val)>>4)*10)
#define BIN_TO_BCD(val) ((val)=(((val)/10)<<4) + (val)%10)
-/* The epoch.
- Unix uses 1900 as epoch for a struct tm, and 1970 for a time_t.
- But what was written to CMOS?
- Digital DECstations use 1928 - this is on a mips
- Digital Unix uses 1952.
- Windows NT uses 1980.
- The ARC console expects to boot Windows NT and uses 1980.
- (But a Ruffian uses 1900, just like SRM.)
- It is reported that ALPHA_PRE_V1_2_SRM_CONSOLE uses 1958. */
+/*
+ * The epoch.
+ *
+ * Unix uses 1900 as epoch for a struct tm, and 1970 for a time_t.
+ * But what was written to CMOS?
+ * Digital DECstations use 1928 - this is on a mips or alpha
+ * Digital Unix uses 1952, e.g. on AXPpxi33
+ * Windows NT uses 1980.
+ * The ARC console expects to boot Windows NT and uses 1980.
+ * (But a Ruffian uses 1900, just like SRM.)
+ * It is reported that ALPHA_PRE_V1_2_SRM_CONSOLE uses 1958.
+ */
#define TM_EPOCH 1900
int cmos_epoch = 1900;
@@ -154,12 +157,13 @@ set_cmos_epoch(int ARCconsole, int SRM) {
return;
}
- /* The kernel source today says: read the year. If it is
- in 11-43 then the epoch is 1980 (this covers 1991-2023).
- Otherwise, if it is less than 96 then the epoch is 1952
- (this covers 1952-1962 and 1996-2047). Otherwise, the epoch
- is 1900 (this covers 1996-1999, or rather 1996-2155). */
-
+ /* The kernel source today says: read the year.
+ If it is in 0-19 then the epoch is 2000.
+ If it is in 20-47 then the epoch is 1980.
+ If it is in 48-69 then the epoch is 1952.
+ If it is in 70-99 then the epoch is 1928.
+ Otherwise the epoch is 1900.
+ Clearly, this must be changed before 2019. */
/* See whether we are dealing with SRM or MILO, as they have
different "epoch" ideas. */
diff --git a/hwclock/hwclock.8 b/hwclock/hwclock.8
index d62f5035e..0d5f014c9 100644
--- a/hwclock/hwclock.8
+++ b/hwclock/hwclock.8
@@ -590,10 +590,9 @@ on old systems)
.BR tzset (3)
.SH AUTHORS
-Written By Bryan Henderson, September 1996 (bryanh@giraffe-data.com),
+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/hwclock/hwclock.c b/hwclock/hwclock.c
index 20c548eb0..9cf46dda1 100644
--- a/hwclock/hwclock.c
+++ b/hwclock/hwclock.c
@@ -20,6 +20,7 @@
*
* Fix for Award 2094 bug, Dave Coffin (dcoffin@shore.net) 11/12/98
* Change of local time handling, Stefan Ring <e9725446@stud3.tuwien.ac.at>
+ * Change of adjtime handling, James P. Rutledge <ao112@rgfn.epcc.edu>.
*
* Distributed under GPL
*/
@@ -78,13 +79,13 @@
#include <sys/time.h>
#include <sys/stat.h>
#include <stdarg.h>
+#include <getopt.h>
+#include <sysexits.h>
-#include "shhopt.h"
#include "clock.h"
#include "nls.h"
#define MYNAME "hwclock"
-#define VERSION "2.4c"
char *progname = MYNAME;
@@ -108,14 +109,17 @@ struct adjtime {
updated since read from the disk file).
*/
bool dirty;
+
/* line 1 */
- float drift_factor;
+ double drift_factor;
time_t last_adj_time;
- float not_adjusted;
+ double 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
@@ -170,18 +174,18 @@ read_date_from_file (struct tm *tm) {
write_date_to_file (tm);
}
-static float
+static double
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 );
+ return (subtrahend.tv_sec - subtractor.tv_sec)
+ + (subtrahend.tv_usec - subtractor.tv_usec) / 1E6;
}
static struct timeval
-time_inc(struct timeval addend, float increment) {
+time_inc(struct timeval addend, double increment) {
/*----------------------------------------------------------------------------
The time, in "timeval" format, which is <increment> seconds after
the time <addend>. Of course, <increment> may be negative.
@@ -199,7 +203,7 @@ time_inc(struct timeval addend, float increment) {
newtime.tv_usec -= 1E6;
newtime.tv_sec += 1;
}
- return(newtime);
+ return newtime;
}
@@ -223,39 +227,41 @@ hw_clock_is_utc(const bool utc, const bool local_opt,
-static void
-read_adjtime(struct adjtime *adjtime_p, int *rc_p) {
+static int
+read_adjtime(struct adjtime *adjtime_p) {
/*----------------------------------------------------------------------------
Read the adjustment parameters 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.
+ return value 0 if all OK, !=0 otherwise.
-----------------------------------------------------------------------------*/
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 = UNKNOWN;
+ 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 = UNKNOWN;
+
+ return 0;
+ }
- *rc_p = 0;
- } else {
adjfile = fopen(ADJPATH, "r"); /* open file for reading */
if (adjfile == NULL) {
outsyserr("cannot open file " ADJPATH);
- *rc_p = 2;
- } else {
+ return EX_OSFILE;
+ }
+
+ {
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 */
@@ -277,7 +283,7 @@ read_adjtime(struct adjtime *adjtime_p, int *rc_p) {
adjtime_p->last_calib_time = 0;
timeval = 0;
- sscanf(line1, "%f %ld %f",
+ sscanf(line1, "%lf %ld %lf",
&adjtime_p->drift_factor,
&timeval,
&adjtime_p->not_adjusted);
@@ -299,8 +305,6 @@ read_adjtime(struct adjtime *adjtime_p, int *rc_p) {
fprintf(stderr, _("(Expected: `UTC' or `LOCAL' or nothing.)\n"));
}
}
-
- *rc_p = 0;
}
adjtime_p->dirty = FALSE;
@@ -313,12 +317,13 @@ read_adjtime(struct adjtime *adjtime_p, int *rc_p) {
(adjtime_p->local_utc == LOCAL) ? _("local") :
(adjtime_p->local_utc == UTC) ? _("UTC") : _("unknown"));
}
- }
+
+ return 0;
}
-static void
-synchronize_to_clock_tick(int *retcode_p) {
+static int
+synchronize_to_clock_tick(void) {
/*-----------------------------------------------------------------------------
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
@@ -330,14 +335,17 @@ synchronize_to_clock_tick(int *retcode_p) {
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.
-
+ Return 0 if it worked, nonzero if it didn't.
-----------------------------------------------------------------------------*/
- if (debug) printf(_("Waiting for clock tick...\n"));
+ int rc;
- *retcode_p = ur->synchronize_to_clock_tick();
+ if (debug) printf(_("Waiting for clock tick...\n"));
- if (debug) printf(_("...got clock tick\n"));
+ rc = ur->synchronize_to_clock_tick();
+
+ if (debug) printf(_("...got clock tick\n"));
+
+ return rc;
}
@@ -520,7 +528,7 @@ set_hardware_clock_exact(const time_t settime,
static void
display_time(const bool hclock_valid, const time_t systime,
- const float sync_duration) {
+ const double sync_duration) {
/*----------------------------------------------------------------------------
Put the time "systime" on standard output in display format.
Except if hclock_valid == false, just tell standard output that we don't
@@ -638,7 +646,7 @@ interpret_date_string(const char *date_opt, time_t * const time_p) {
}
fclose(date_child_fp);
- return(retcode);
+ return retcode;
}
@@ -663,7 +671,7 @@ set_system_clock(const bool hclock_valid, const time_t newtime,
int retcode;
if (!hclock_valid) {
- fprintf(stderr,_("The Hardware Clock does not contain a valid time, so "
+ fprintf(stderr, _("The Hardware Clock does not contain a valid time, so "
"we cannot set the System Time from it.\n"));
retcode = 1;
} else {
@@ -685,10 +693,10 @@ set_system_clock(const bool hclock_valid, const time_t newtime,
#endif
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 = %d\n"), minuteswest);
+ 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 = %d\n"), minuteswest);
}
if (testing) {
printf(_("Not setting system clock because running in test mode.\n"));
@@ -697,85 +705,130 @@ set_system_clock(const bool hclock_valid, const time_t newtime,
const struct timezone tz = { minuteswest, 0 };
rc = settimeofday(&tv, &tz);
- if (rc != 0) {
- if (errno == EPERM)
- fprintf(stderr, _("Must be superuser to set system clock.\n"));
- else
- outsyserr(_("settimeofday() failed"));
- retcode = 1;
+ if (rc) {
+ if (errno == EPERM) {
+ fprintf(stderr,
+ _("Must be superuser to set system clock.\n"));
+ retcode = EX_NOPERM;
+ } else {
+ outsyserr(_("settimeofday() failed"));
+ retcode = 1;
+ }
} else retcode = 0;
}
}
- return(retcode);
+ return retcode;
}
static void
adjust_drift_factor(struct adjtime *adjtime_p,
const time_t nowtime,
- const bool hclock_valid, const time_t hclocktime ) {
-/*---------------------------------------------------------------------------
+ const bool hclock_valid,
+ const time_t hclocktime,
+ const double sync_delay) {
+/*------------------------------------------------------------------------
Update the drift factor in <*adjtime_p> to reflect the fact that the
Hardware Clock was calibrated to <nowtime> and before that was set
to <hclocktime>.
- We assume that the user has been doing regular drift adjustments
- using the drift factor in the adjtime file, so if <nowtime> and
- <clocktime> are different, that means the adjustment factor isn't
- quite right.
-
We record in the adjtime file the time at which we last calibrated
the clock so we can compute the drift rate each time we calibrate.
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.
-
-----------------------------------------------------------------------------*/
- if (!hclock_valid) {
- if (debug)
- printf(_("Not adjusting drift factor because the Hardware Clock "
- "previously contained garbage.\n"));
- } else if ((hclocktime - adjtime_p->last_calib_time) < 23 * 60 * 60) {
- if (debug)
- printf(_("Not adjusting drift factor because it has been less than a "
- "day since the last calibration.\n"));
- } else if (adjtime_p->last_calib_time != 0) {
- const float factor_adjust =
- ((float) (nowtime - hclocktime)
- / (hclocktime - adjtime_p->last_calib_time))
- * 24 * 60 * 60;
-
- if (debug)
- printf(_("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"),
- (int) (nowtime - hclocktime),
- (int) (hclocktime - adjtime_p->last_calib_time),
- adjtime_p->drift_factor,
- factor_adjust );
+ ------------------------------------------------------------------------*/
+ 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 last "
+ "calibration time is zero,\n"
+ "so history is bad and calibration startover "
+ "is necessary.\n"));
+ } else if ((hclocktime - adjtime_p->last_calib_time) < 23 * 60 * 60) {
+ if (debug)
+ printf(_("Not adjusting drift factor because it has "
+ "been less than a day since the last "
+ "calibration.\n"));
+ } else if (adjtime_p->last_calib_time != 0) {
+ /*
+ * At adjustment time we adjust the hardware clock according
+ * to the contents of /etc/adjtime.
+ *
+ * At calibration time we set the hardware clock and
+ * update /etc/adjtime, that is, for each calibration
+ * (except the first) we also do an adjustment.
+ *
+ * We are now at calibration time.
+ *
+ * Let us do computation in doubles. (Floats almost suffice,
+ * but 195 days + 1 second equals 195 days in floats.)
+ */
+ const double sec_per_day = 24.0 * 60.0 * 60.0;
+ double atime_per_htime;
+ double adj_days, cal_days;
+ double exp_drift, unc_drift;
+ double factor_adjust;
+
+ /* Adjusted time units per hardware time unit */
+ atime_per_htime = 1.0 + adjtime_p->drift_factor / sec_per_day;
+
+ /* Days since last adjustment (in hardware clock time) */
+ adj_days = (double)(hclocktime - adjtime_p->last_adj_time)
+ / sec_per_day;
+
+ /* Expected drift (sec) since last adjustment */
+ exp_drift = adj_days * adjtime_p->drift_factor
+ + adjtime_p->not_adjusted;
+
+ /* Uncorrected drift (sec) since last calibration */
+ unc_drift = (double)(nowtime - hclocktime)
+ + sync_delay - exp_drift;
+
+ /* Days since last calibration (in hardware clock time) */
+ cal_days = ((double)(adjtime_p->last_adj_time
+ - adjtime_p->last_calib_time)
+ + adjtime_p->not_adjusted)
+ / (sec_per_day * atime_per_htime) + adj_days;
+
+ /* Amount to add to previous drift factor */
+ factor_adjust = unc_drift / cal_days;
+
+ 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) (nowtime - adjtime_p->last_calib_time),
+ adjtime_p->drift_factor,
+ factor_adjust);
- adjtime_p->drift_factor += factor_adjust;
- }
- adjtime_p->last_calib_time = nowtime;
+ adjtime_p->drift_factor += factor_adjust;
+ }
+ adjtime_p->last_calib_time = nowtime;
- adjtime_p->last_adj_time = nowtime;
+ adjtime_p->last_adj_time = nowtime;
- adjtime_p->not_adjusted = 0;
+ adjtime_p->not_adjusted = 0;
- adjtime_p->dirty = TRUE;
+ adjtime_p->dirty = TRUE;
}
static void
-calculate_adjustment(
- const float factor,
+calculate_adjustment(const double factor,
const time_t last_time,
- const float not_adjusted,
+ const double not_adjusted,
const time_t systime,
int *adjustment_p,
- float *retro_p,
+ double *retro_p,
const int debug ) {
/*----------------------------------------------------------------------------
Do the drift adjustment calculation.
@@ -790,13 +843,13 @@ calculate_adjustment(
advance the clock or insert seconds. Negative means to retard the clock
or remove seconds.
----------------------------------------------------------------------------*/
- float exact_adjustment;
+ double exact_adjustment;
- exact_adjustment = ((float) (systime - last_time)) * factor / (24 * 60 * 60)
+ exact_adjustment = ((double) (systime - last_time)) * factor / (24 * 60 * 60)
+ not_adjusted;
*adjustment_p = FLOOR(exact_adjustment);
- *retro_p = exact_adjustment - (float) *adjustment_p;
+ *retro_p = exact_adjustment - (double) *adjustment_p;
if (debug) {
printf (_("Time since last adjustment is %d seconds\n"),
(int) (systime - last_time));
@@ -897,10 +950,18 @@ do_adjustment(struct adjtime *adjtime_p,
if (!hclock_valid) {
fprintf(stderr, _("The Hardware Clock does not contain a valid time, "
"so we cannot adjust it.\n"));
+ adjtime_p->last_calib_time = 0; /* calibration startover is required */
+ 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 setting clock because last adjustment time is zero, "
+ "so history is bad.");
} else {
int adjustment;
/* Number of seconds we must insert in the Hardware Clock */
- float retro;
+ double retro;
/* Fraction of second we have to remove from clock after inserting
<adjustment> whole seconds.
*/
@@ -951,13 +1012,13 @@ determine_clock_access_method(const bool user_requests_ISA) {
}
}
-static void
+static int
manipulate_clock(const bool show, const bool adjust, const bool noadjfile,
const bool set, const time_t set_time,
const bool hctosys, const bool systohc,
const struct timeval startup_time,
const bool utc, const bool local_opt,
- const bool testing, int *retcode_p) {
+ const bool testing) {
/*---------------------------------------------------------------------------
Do all the normal work of hwclock - read, set clock, etc.
@@ -965,24 +1026,26 @@ manipulate_clock(const bool show, const bool adjust, const bool noadjfile,
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 */
-
- no_auth = ur->get_permissions();
-
- if (no_auth) *retcode_p = 1;
- else {
- if (!noadjfile && (adjust || set || systohc || (!utc && !local_opt)))
- read_adjtime(&adjtime, &rc);
- else {
+ 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 */
+
+ no_auth = ur->get_permissions();
+ if (no_auth)
+ return EX_NOPERM;
+
+ if (!noadjfile && (adjust || set || systohc || (!utc && !local_opt))) {
+ rc = read_adjtime(&adjtime);
+ if (rc)
+ return rc;
+ } else {
/* A little trick to avoid reading the file if we don't have to */
adjtime.dirty = FALSE;
rc = 0;
}
- if (rc != 0) *retcode_p = 2;
- else {
+
+ {
const bool universal = hw_clock_is_utc(utc, local_opt, adjtime);
if ((set || systohc || adjust) &&
@@ -991,9 +1054,11 @@ manipulate_clock(const bool show, const bool adjust, const bool noadjfile,
adjtime.dirty = TRUE;
}
- synchronize_to_clock_tick(retcode_p);
- /* this takes up to 1 second */
- if (*retcode_p == 0) {
+ rc = synchronize_to_clock_tick(); /* this takes up to 1 second */
+ if (rc)
+ return rc;
+
+ {
struct timeval read_time;
/* The time at which we read the Hardware Clock */
@@ -1014,16 +1079,14 @@ manipulate_clock(const bool show, const bool adjust, const bool noadjfile,
if (show) {
display_time(hclock_valid, hclocktime,
time_diff(read_time, startup_time));
- *retcode_p = 0;
} else if (set) {
set_hardware_clock_exact(set_time, startup_time,
universal, testing);
- adjust_drift_factor(&adjtime, set_time, hclock_valid, hclocktime);
- *retcode_p = 0;
+ adjust_drift_factor(&adjtime, set_time, hclock_valid, hclocktime,
+ time_diff(read_time, startup_time));
} else if (adjust) {
do_adjustment(&adjtime, hclock_valid, hclocktime,
read_time, universal, testing);
- *retcode_p = 0;
} else if (systohc) {
struct timeval nowtime, reftime;
/* We can only set_hardware_clock_exact to a whole seconds
@@ -1036,22 +1099,20 @@ manipulate_clock(const bool show, const bool adjust, const bool noadjfile,
set_hardware_clock_exact((time_t) reftime.tv_sec, reftime,
universal, testing);
- *retcode_p = 0;
adjust_drift_factor(&adjtime, (time_t) reftime.tv_sec, hclock_valid,
- hclocktime);
+ hclocktime, (double) read_time.tv_usec / 1E6);
} else if (hctosys) {
rc = set_system_clock(hclock_valid, hclocktime, testing);
- if (rc != 0) {
+ if (rc) {
printf(_("Unable to set system clock.\n"));
- *retcode_p = 1;
- } else *retcode_p = 0;
+ return rc;
+ }
}
- if (!noadjfile) {
+ if (!noadjfile)
save_adjtime(adjtime, testing);
- }
}
}
- }
+ return 0;
}
@@ -1104,6 +1165,11 @@ manipulate_epoch(const bool getepoch, const bool setepoch,
#define RTC_DEV "/dev/rtc"
#endif
+static void
+out_version(void) {
+ printf(_("%s from %s\n"), MYNAME, util_linux_version);
+}
+
/*
usage - Output (error and) usage information
@@ -1148,7 +1214,7 @@ usage( const char *fmt, ... ) {
" either --utc or --localtime\n"
),RTC_DEV);
#ifdef __alpha__
- fprintf( usageto, _(
+ fprintf(usageto, _(
" --jensen, --arc, --srm, --funky-toy\n"
" tell hwclock the type of alpha you have (see hwclock(8))\n"
) );
@@ -1156,200 +1222,272 @@ usage( const char *fmt, ... ) {
fflush(stdout);
- if( fmt ) {
+ if (fmt) {
usageto = stderr;
va_start(ap, fmt);
vfprintf(stderr, fmt, ap);
va_end(ap);
}
- exit( fmt ? 99 : 0 );
+ exit(fmt ? EX_USAGE : 0);
}
+static const struct option longopts[] = {
+ { "adjust", 0, 0, 'a' },
+ { "help", 0, 0, 'h' },
+ { "show", 0, 0, 'r' },
+ { "hctosys", 0, 0, 's' },
+ { "utc", 0, 0, 'u' },
+ { "version", 0, 0, 'v' },
+ { "systohc", 0, 0, 'w' },
+ { "debug", 0, 0, 'D' },
+#ifdef __alpha__
+ { "ARC", 0, 0, 'A' },
+ { "arc", 0, 0, 'A' },
+ { "Jensen", 0, 0, 'J' },
+ { "jensen", 0, 0, 'J' },
+ { "SRM", 0, 0, 'S' },
+ { "srm", 0, 0, 'S' },
+ { "funky-toy", 0, 0, 'F'}
+#endif
+ { "set", 0, 0, 128 },
+ { "getepoch", 0, 0, 129 },
+ { "setepoch", 0, 0, 130 },
+ { "noadjfile", 0, 0, 131 },
+ { "localtime", 0, 0, 132 },
+ { "badyear", 0, 0, 133 },
+ { "directisa", 0, 0, 134 },
+ { "test", 0, 0, 135 },
+ { "date", 1, 0, 136 },
+ { "epoch", 1, 0, 137 },
+ { NULL, 0, 0, 0 }
+};
+
+/*
+ * Returns:
+ * EX_USAGE: bad invocation
+ * EX_NOPERM: no permission
+ * EX_OSFILE: cannot open /dev/rtc or /etc/adjtime
+ * EX_IOERR: ioctl error getting or setting the time
+ * 0: OK (or not)
+ * 1: failure
+ */
int
main(int argc, char **argv) {
- 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 */
+ 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 */
- bool permitted; /* User is permitted to do the function */
- int retcode; /* Our eventual return code */
+ bool permitted; /* User is permitted to do the function */
+ int rc, c;
- int rc; /* local return code */
+ /* Variables set by various options; show may also be set later */
+ /* The options debug, badyear and epoch_option are global */
+ bool show, set, systohc, hctosys, adjust, getepoch, setepoch;
+ bool utc, testing, local_opt, noadjfile, directisa;
+ bool ARCconsole, Jensen, SRM, funky_toy;
+ char *date_opt;
- /* 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 help, show, set, systohc, hctosys, adjust, getepoch, setepoch, version;
- bool ARCconsole, utc, testing, directisa, Jensen, SRM, funky_toy, noadjfile;
- bool local_opt;
- char *date_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 },
- { '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 },
- { 0, (char *) "noadjfile", OPT_FLAG, &noadjfile, 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_option,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 },
-#ifdef __alpha__
- { 'A', (char *) "ARC", OPT_FLAG, &ARCconsole,0 },
- { 'A', (char *) "arc", OPT_FLAG, &ARCconsole,0 },
- { 'J', (char *) "Jensen", OPT_FLAG, &Jensen, 0 },
- { 'J', (char *) "jensen", OPT_FLAG, &Jensen, 0 },
- { 'S', (char *) "SRM", OPT_FLAG, &SRM, 0 },
- { 'S', (char *) "srm", OPT_FLAG, &SRM, 0 },
- { 'F', (char *) "funky-toy", OPT_FLAG, &funky_toy, 0 },
-#endif
- { 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 */
+ /* Remember what time we were invoked */
+ gettimeofday(&startup_time, NULL);
- gettimeofday(&startup_time, NULL); /* Remember what time we were invoked */
-
- setlocale(LC_ALL, "");
+ setlocale(LC_ALL, "");
#ifdef LC_NUMERIC
- /* We need LC_CTYPE and LC_TIME and LC_MESSAGES, but must avoid
- LC_NUMERIC since it gives problems when we write to /etc/adjtime.
- - gqueri@mail.dotcom.fr */
- setlocale(LC_NUMERIC, "C");
+ /* We need LC_CTYPE and LC_TIME and LC_MESSAGES, but must avoid
+ LC_NUMERIC since it gives problems when we write to /etc/adjtime.
+ - gqueri@mail.dotcom.fr */
+ setlocale(LC_NUMERIC, "C");
#endif
- bindtextdomain(PACKAGE, LOCALEDIR);
- textdomain(PACKAGE);
-
- /* set option defaults */
- help = show = set = systohc = hctosys = adjust = noadjfile =
- getepoch = setepoch = version = utc = local_opt =
- ARCconsole = SRM = funky_toy = directisa = badyear = Jensen =
- testing = debug = FALSE;
- date_opt = NULL;
-
- 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, utc, local_opt, version,
- testing, debug, set, date_opt, getepoch, setepoch, epoch_option,
- noadjtime */
- /* This is an ugly routine - for example, if I give an incorrect
- option, it only says "unrecognized option" without telling
- me what options are recognized. Rewrite with standard
- getopt() and usage() and throw shhopt out. */
-
- if (argc_parse - 1 > 0) {
- usage( _("%s takes no non-option arguments. "
- "You supplied %d.\n"),
- MYNAME, argc_parse - 1);
- }
+ bindtextdomain(PACKAGE, LOCALEDIR);
+ textdomain(PACKAGE);
+
+ /* Set option defaults */
+ show = set = systohc = hctosys = adjust = noadjfile = FALSE;
+ getepoch = setepoch = utc = local_opt = testing = debug = FALSE;
+ ARCconsole = Jensen = SRM = funky_toy = directisa = badyear = FALSE;
+ date_opt = NULL;
+
+ while ((c = getopt_long (argc, argv, "?hvVDarsuwAJSF", longopts, NULL))
+ != -1) {
+ switch (c) {
+ case 'D':
+ debug = TRUE;
+ break;
+ case 'a':
+ adjust = TRUE;
+ break;
+ case 'r':
+ show = TRUE;
+ break;
+ case 's':
+ hctosys = TRUE;
+ break;
+ case 'u':
+ utc = TRUE;
+ break;
+ case 'w':
+ systohc = TRUE;
+ break;
+#ifdef __alpha__
+ case 'A':
+ ARCconsole = TRUE;
+ break;
+ case 'J':
+ Jensen = TRUE;
+ break;
+ case 'S':
+ SRM = TRUE;
+ break;
+ case 'F':
+ funky_toy = TRUE;
+ break;
+#endif
+ case 128:
+ set = TRUE;
+ break;
+ case 129:
+ getepoch = TRUE;
+ break;
+ case 130:
+ setepoch = TRUE;
+ break;
+ case 131:
+ noadjfile = TRUE;
+ break;
+ case 132:
+ local_opt = TRUE; /* --localtime */
+ break;
+ case 133:
+ badyear = TRUE;
+ break;
+ case 134:
+ directisa = TRUE;
+ break;
+ case 135:
+ testing = TRUE; /* --test */
+ break;
+ case 136:
+ date_opt = optarg; /* --date */
+ break;
+ case 137:
+ epoch_option = atoi(optarg); /* --epoch */
+ break;
+ case 'v': /* --version */
+ case 'V':
+ out_version();
+ return 0;
+ case 'h': /* --help */
+ case '?':
+ default:
+ usage(NULL);
+ }
+ }
- if (help)
- usage( NULL );
+ argc -= optind;
+ argv += optind;
- if (show + set + systohc + hctosys + adjust +
- getepoch + setepoch + version > 1) {
- fprintf(stderr, _("You have specified multiple function options.\n"
- "You can only perform one function at a time.\n"));
- exit(100);
- }
+ if (argc > 0) {
+ usage(_("%s takes no non-option arguments. "
+ "You supplied %d.\n"),
+ MYNAME, argc);
+ }
- 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 > 1){
+ fprintf(stderr, _("You have specified multiple functions.\n"
+ "You can only perform one function "
+ "at a time.\n"));
+ exit(EX_USAGE);
+ }
- if (adjust && noadjfile) {
- fprintf(stderr, _("%s: The --adjust and --noadjfile options are mutually "
- "exclusive. You specified both.\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(EX_USAGE);
+ }
- if (noadjfile && !(utc || local_opt)) {
- fprintf(stderr, _("%s: With --noadjfile, you must specify either "
- "--utc or --localtime\n"), MYNAME);
- exit(100);
- }
+ if (adjust && noadjfile) {
+ fprintf(stderr, _("%s: The --adjust and --noadjfile options "
+ "are mutually exclusive. You specified "
+ "both.\n"), MYNAME);
+ exit(EX_USAGE);
+ }
+
+ if (noadjfile && !(utc || local_opt)) {
+ fprintf(stderr, _("%s: With --noadjfile, you must specify "
+ "either --utc or --localtime\n"), MYNAME);
+ exit(EX_USAGE);
+ }
#ifdef __alpha__
- set_cmos_epoch(ARCconsole, SRM);
- set_cmos_access(Jensen, funky_toy);
+ set_cmos_epoch(ARCconsole, SRM);
+ set_cmos_access(Jensen, funky_toy);
#endif
- if (set) {
- rc = interpret_date_string(date_opt, &set_time); /* (time-consuming) */
- if (rc != 0) {
- fprintf(stderr, _("No usable set-to time. Cannot set clock.\n"));
- exit(100);
- }
- }
+ if (set) {
+ rc = interpret_date_string(date_opt, &set_time);
+ /* (time-consuming) */
+ if (rc != 0) {
+ fprintf(stderr, _("No usable set-to time. "
+ "Cannot set clock.\n"));
+ exit(EX_USAGE);
+ }
+ }
- if (!(show | set | systohc | hctosys | adjust | getepoch | setepoch |
- version))
- show = 1; /* default to show */
+ if (!(show | set | systohc | hctosys | adjust | getepoch | setepoch))
+ show = 1; /* 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,
- _("Sorry, only the superuser can change the Hardware Clock.\n"));
- permitted = FALSE;
- } else if (hctosys) {
- fprintf(stderr,
- _("Sorry, only the superuser can change the System Clock.\n"));
- permitted = FALSE;
- } else if (setepoch) {
- fprintf(stderr,
- _("Sorry, only the superuser can change "
- "the Hardware Clock epoch in the kernel.\n"));
- permitted = FALSE;
- } else
- permitted = TRUE;
- }
+ if (getuid() == 0)
+ permitted = TRUE;
+ else {
+ /* program is designed to run setuid (in some situations) */
+ if (set || hctosys || systohc || adjust) {
+ fprintf(stderr,
+ _("Sorry, only the superuser can change "
+ "the Hardware Clock.\n"));
+ permitted = FALSE;
+ } else if (hctosys) {
+ fprintf(stderr,
+ _("Sorry, only the superuser can change "
+ "the System Clock.\n"));
+ permitted = FALSE;
+ } else if (setepoch) {
+ fprintf(stderr,
+ _("Sorry, only the superuser can change the "
+ "Hardware Clock epoch in the kernel.\n"));
+ permitted = FALSE;
+ } else
+ permitted = TRUE;
+ }
- if (!permitted) retcode = 2;
- else {
- retcode = 0;
- if (version) {
- printf(MYNAME " " VERSION "/%s\n",util_linux_version);
- } else if (getepoch || setepoch) {
- manipulate_epoch(getepoch, setepoch, epoch_option, 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 method.\n"));
- if (!debug)
+ if (!permitted)
+ exit(EX_NOPERM);
+
+ if (getepoch || setepoch) {
+ manipulate_epoch(getepoch, setepoch, epoch_option, testing);
+ return 0;
+ }
+
+ if (debug)
+ out_version();
+ determine_clock_access_method(directisa);
+ if (!ur) {
fprintf(stderr,
- _("Use the --debug option to see the details of our "
- "search for an access method.\n"));
- } else
- manipulate_clock(show, adjust, noadjfile, set, set_time,
- hctosys, systohc, startup_time, utc, local_opt,
- testing, &rc);
- }
- }
- exit(retcode);
+ _("Cannot access the Hardware Clock via "
+ "any known method.\n"));
+ if (!debug)
+ fprintf(stderr,
+ _("Use the --debug option to see the details "
+ "of our search for an access method.\n"));
+ exit(1);
+ }
+
+ return manipulate_clock(show, adjust, noadjfile, set, set_time,
+ hctosys, systohc, startup_time, utc,
+ local_opt, testing);
}
/* A single routine for greater uniformity */
diff --git a/hwclock/kd.c b/hwclock/kd.c
index f3327e1cc..dbbe758f4 100644
--- a/hwclock/kd.c
+++ b/hwclock/kd.c
@@ -1,6 +1,7 @@
/* kd.c - KDGHWCLK stuff, possibly m68k only */
#include <unistd.h> /* for close() */
#include <fcntl.h> /* for O_RDONLY */
+#include <sysexits.h>
#include <sys/ioctl.h>
#include "../defines.h" /* for HAVE_nanosleep */
@@ -90,7 +91,7 @@ read_hardware_clock_kd(struct tm *tm) {
if (ioctl(con_fd, KDGHWCLK, &t) == -1) {
outsyserr(_("ioctl() failed to read time from %s"), con_fd_filename);
- exit(5);
+ exit(EX_IOERR);
}
tm->tm_sec = t.sec;
diff --git a/hwclock/rtc.c b/hwclock/rtc.c
index 2694d8663..f6fb0186e 100644
--- a/hwclock/rtc.c
+++ b/hwclock/rtc.c
@@ -1,6 +1,7 @@
/* rtc.c - Use /dev/rtc for clock access */
#include <unistd.h> /* for close() */
#include <fcntl.h> /* for O_RDONLY */
+#include <sysexits.h>
#include <sys/ioctl.h>
#include "clock.h"
@@ -90,17 +91,29 @@ struct linux_rtc_time {
static char rtc_dev_name[40];
-/* maybe we should not try /dev/misc/efirtc?
- maybe we should reset rtc_dev_name to give better error messages */
+/* maybe we should not try /dev/misc/efirtc? */
static int
open_rtc(void) {
int rtc_fd;
sprintf(rtc_dev_name, "/dev/%s", RTC_DEVN);
rtc_fd = open(rtc_dev_name, O_RDONLY);
- if (rtc_fd < 0) {
+ if (rtc_fd < 0 && errno == ENOENT) {
sprintf(rtc_dev_name, "/dev/misc/%s", RTC_DEVN);
rtc_fd = open(rtc_dev_name, O_RDONLY);
+ if (rtc_fd < 0 && errno == ENOENT)
+ sprintf(rtc_dev_name, "/dev/%s", RTC_DEVN);
+ }
+ return rtc_fd;
+}
+
+static int
+open_rtc_or_exit(void) {
+ int rtc_fd = open_rtc();
+
+ if (rtc_fd < 0) {
+ outsyserr(_("open() of %s failed"), rtc_dev_name);
+ exit(EX_OSFILE);
}
return rtc_fd;
}
@@ -135,7 +148,7 @@ do_rtc_read_ioctl(int rtc_fd, struct tm *tm) {
perror(ioctlname);
fprintf(stderr, _("ioctl() to %s to read the time failed.\n"),
rtc_dev_name);
- exit(5);
+ exit(EX_IOERR);
}
tm->tm_isdst = -1; /* don't know whether it's dst */
@@ -204,7 +217,7 @@ int ret;
#else
rc = ioctl(rtc_fd, RTC_UIE_ON, 0);
#endif
- if (rc == -1 && errno == EINVAL) {
+ if (rc == -1 && (errno == ENOTTY || 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.
@@ -245,11 +258,7 @@ static int
read_hardware_clock_rtc(struct tm *tm) {
int rtc_fd;
- rtc_fd = open_rtc();
- if (rtc_fd == -1) {
- outsyserr(_("open() of %s failed"), rtc_dev_name);
- exit(5);
- }
+ rtc_fd = open_rtc_or_exit();
/* Read the RTC time/date, return answer via tm */
do_rtc_read_ioctl(rtc_fd, tm);
@@ -269,11 +278,8 @@ set_hardware_clock_rtc(const struct tm *new_broken_time) {
int rtc_fd;
char *ioctlname;
- rtc_fd = open_rtc();
- if (rtc_fd < 0) {
- outsyserr(_("Unable to open %s"), rtc_dev_name);
- exit(5);
- }
+ rtc_fd = open_rtc_or_exit();
+
#ifdef __sparc__
{
struct sparc_rtc_time stm;
@@ -299,7 +305,7 @@ set_hardware_clock_rtc(const struct tm *new_broken_time) {
perror(ioctlname);
fprintf(stderr, _("ioctl() to %s to set the time failed.\n"),
rtc_dev_name);
- exit(5);
+ exit(EX_IOERR);
}
if (debug)
diff --git a/hwclock/shhopt-1.1.lsm b/hwclock/shhopt-1.1.lsm
deleted file mode 100644
index a61a26969..000000000
--- a/hwclock/shhopt-1.1.lsm
+++ /dev/null
@@ -1,17 +0,0 @@
-Begin3
-Title: shhopt - library for parsing command line options.
-Version: 1.1
-Entered-date: 06JUN96
-Description: C-functions for parsing command line options, both
- traditional one-character options, and GNU'ish
- --long-options.
-Keywords: programming, library, lib, commandline
-Author: sverrehu@ifi.uio.no (Sverre H. Huseby)
-Primary-site: sunsite.unc.edu /pub/Linux/libs
- shhopt-1.1.tar.gz
-Platforms: Requires ANSI C-compiler.
-Copying-policy: BeerWare: If you have the time and money, send me a bottle
- of your favourite beer. If not, just send me a mail or
- something. Copy and use as you wish; just leave the
- author's name where you find it.
-End
diff --git a/hwclock/shhopt.c b/hwclock/shhopt.c
deleted file mode 100644
index ac3412829..000000000
--- a/hwclock/shhopt.c
+++ /dev/null
@@ -1,468 +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"
-#include "nls.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.
- *
- */
-static 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/hwclock/shhopt.h b/hwclock/shhopt.h
deleted file mode 100644
index ca8501ef5..000000000
--- a/hwclock/shhopt.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* $Id: shhopt.h,v 2.2 1997/07/06 23:11:58 aebr 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[], int allowNegNum);
-
-#endif
diff --git a/lib/nls.h b/lib/nls.h
index d36a5bc88..f54f94dfc 100644
--- a/lib/nls.h
+++ b/lib/nls.h
@@ -14,7 +14,7 @@ int main(int argc, char *argv[]);
# include <locale.h>
#endif
-#ifdef ENABLE_NLS
+#if defined MAY_ENABLE_NLS && !defined DISABLE_NLS
# include <libintl.h>
# define _(Text) gettext (Text)
# ifdef gettext_noop
diff --git a/lib/pathnames.h b/lib/pathnames.h
index 33886a5c6..d9e05b321 100644
--- a/lib/pathnames.h
+++ b/lib/pathnames.h
@@ -105,7 +105,7 @@ Libc5 and glibc 2.0-2.1 have /var/spool/mail, but glibc 2.1.1 has /var/mail.
/* no more . in DEFPATH */
#define _PATH_DEFPATH "/usr/local/bin:/bin:/usr/bin"
-#define _PATH_DEFPATH_ROOT SBINDIR ":/bin:" USRSBINDIR ":/usr/bin"
+#define _PATH_DEFPATH_ROOT "/usr/local/sbin:/usr/local/bin:" SBINDIR ":/bin:" USRSBINDIR ":/usr/bin"
#define _PATH_HUSHLOGIN ".hushlogin"
#define _PATH_LASTLOG LOGDIR "/lastlog"
diff --git a/lib/widechar.h b/lib/widechar.h
index 1aa91f3f4..61021be35 100644
--- a/lib/widechar.h
+++ b/lib/widechar.h
@@ -14,7 +14,7 @@
#if 1
/* explicit prototypes, since sometimes <wchar.h> does not give them */
-extern int wcwidth (wint_t c);
+extern int wcwidth (wchar_t c); /* old: wint_t c */
extern int wcswidth (const wchar_t *s, size_t n);
extern size_t wcslen (const wchar_t *s);
extern wchar_t *wcsdup (const wchar_t *s);
diff --git a/mount/Makefile b/mount/Makefile
index 453b640ae..52c4cff6d 100644
--- a/mount/Makefile
+++ b/mount/Makefile
@@ -91,15 +91,25 @@ nfsmount_xdr.o: nfsmount_xdr.c
$(COMPILE) $(RPC_CFLAGS) nfsmount_xdr.c
ifeq "$(HAVE_GOOD_RPC)" "yes"
-nfsmount.h nfsmount_xdr.c nfsmount_clnt.c: nfsmount.x
- rm -f nfsmount.h nfsmount_xdr.c nfsmount_clnt.c
+nfsmount.h: nfsmount.x
+ rm -f nfsmount.h
$(RPCGEN) -h -o nfsmount.h nfsmount.x
+
+nfsmount_xdr.c: nfsmount.x
+ rm -f nfsmount_xdr.c
$(RPCGEN) -c -o nfsmount_xdr.c nfsmount.x
+
+nfsmount_clnt.c: nfsmount.x
+ rm -f nfsmount_clnt.c
$(RPCGEN) -l -o nfsmount_clnt.c nfsmount.x
else
-nfsmount.h nfsmount_xdr.c nfsmount_clnt.c:
+nfsmount.h:
cp $(RPCSVCDIR)/nfsmount.h .
+
+nfsmount_xdr.c:
cp $(RPCSVCDIR)/nfsmount_xdr.c .
+
+nfsmount_clnt.c:
cp $(RPCSVCDIR)/nfsmount_clnt.c .
endif
diff --git a/mount/fstab.c b/mount/fstab.c
index 9329d1ce6..3e3142238 100644
--- a/mount/fstab.c
+++ b/mount/fstab.c
@@ -515,7 +515,7 @@ update_mtab (const char *dir, struct mntent *instead) {
/* write chain to mtemp */
mftmp = my_setmntent (MOUNTED_TEMP, "w");
- if (mftmp == NULL || mfp->mntent_fp == NULL) {
+ if (mftmp == NULL || mftmp->mntent_fp == NULL) {
int errsv = errno;
error (_("cannot open %s (%s) - mtab not updated"),
MOUNTED_TEMP, strerror (errsv));
diff --git a/mount/linux_fs.h b/mount/linux_fs.h
index 3885d724b..4bcf80b6e 100644
--- a/mount/linux_fs.h
+++ b/mount/linux_fs.h
@@ -21,7 +21,7 @@ struct minix_super_block {
u_char s_dummy[16];
u_char s_magic[2];
};
-#define minixmagic(s) ((uint) s.s_magic[0] + (((uint) s.s_magic[1]) << 8))
+#define minixmagic(s) assemble2le(s.s_magic)
#define ISODCL(from, to) (to - from + 1)
#define ISO_STANDARD_ID "CD001"
@@ -46,7 +46,7 @@ struct ext_super_block {
u_char s_dummy[56];
u_char s_magic[2];
};
-#define extmagic(s) ((uint) s.s_magic[0] + (((uint) s.s_magic[1]) << 8))
+#define extmagic(s) assemble2le(s.s_magic)
#define EXT2_PRE_02B_MAGIC 0xEF51
#define EXT2_SUPER_MAGIC 0xEF53
@@ -63,7 +63,7 @@ struct ext2_super_block {
u_char s_dummy3[88];
u_char s_journal_inum[4]; /* ext3 only */
};
-#define ext2magic(s) ((uint) s.s_magic[0] + (((uint) s.s_magic[1]) << 8))
+#define ext2magic(s) assemble2le(s.s_magic)
struct reiserfs_super_block
{
@@ -96,9 +96,7 @@ struct xiafs_super_block {
u_char s_dummy[60];
u_char s_magic[4];
};
-#define xiafsmagic(s) ((uint) s.s_magic[0] + (((uint) s.s_magic[1]) << 8) + \
- (((uint) s.s_magic[2]) << 16) + \
- (((uint) s.s_magic[3]) << 24))
+#define xiafsmagic(s) assemble4le(s.s_magic)
/* From jj@sunsite.ms.mff.cuni.cz Mon Mar 23 15:19:05 1998 */
#define UFS_SUPER_MAGIC_LE 0x00011954
@@ -107,9 +105,7 @@ struct ufs_super_block {
u_char s_dummy[0x55c];
u_char s_magic[4];
};
-#define ufsmagic(s) ((uint) s.s_magic[0] + (((uint) s.s_magic[1]) << 8) + \
- (((uint) s.s_magic[2]) << 16) + \
- (((uint) s.s_magic[3]) << 24))
+#define ufsmagic(s) assemble4le(s.s_magic)
/* From Richard.Russon@ait.co.uk Wed Feb 24 08:05:27 1999 */
#define NTFS_SUPER_MAGIC "NTFS"
@@ -150,9 +146,7 @@ struct cramfs_super_block {
u_char s_dummy[12];
u_char s_id[16];
};
-#define cramfsmagic(s) ((uint) s.s_magic[0] + (((uint) s.s_magic[1]) << 8) + \
- (((uint) s.s_magic[2]) << 16) + \
- (((uint) s.s_magic[3]) << 24))
+#define cramfsmagic(s) assemble4le(s.s_magic)
#define HFS_SUPER_MAGIC 0x4244
struct hfs_super_block {
@@ -160,20 +154,15 @@ struct hfs_super_block {
u_char s_dummy[18];
u_char s_blksize[4];
};
-#define hfsmagic(s) ((uint) s.s_magic[0] + (((uint) s.s_magic[1]) << 8))
-#define hfsblksize(s) ((uint) s.s_blksize[0] + \
- (((uint) s.s_blksize[1]) << 8) + \
- (((uint) s.s_blksize[2]) << 16) + \
- (((uint) s.s_blksize[3]) << 24))
+#define hfsmagic(s) assemble2le(s.s_magic)
+#define hfsblksize(s) assemble4le(s.s_blksize)
#define HPFS_SUPER_MAGIC 0xf995e849
struct hpfs_super_block {
u_char s_magic[4];
u_char s_magic2[4];
};
-#define hpfsmagic(s) ((uint) s.s_magic[0] + (((uint) s.s_magic[1]) << 8) + \
- (((uint) s.s_magic[2]) << 16) + \
- (((uint) s.s_magic[3]) << 24))
+#define hpfsmagic(s) assemble4le(s.s_magic)
struct adfs_super_block {
u_char s_dummy[448];
@@ -187,9 +176,7 @@ struct adfs_super_block {
struct vxfs_super_block {
u_char s_magic[4];
};
-#define vxfsmagic(s) ((uint) s.s_magic[0] + (((uint) s.s_magic[1]) << 8) + \
- (((uint) s.s_magic[2]) << 16) + \
- (((uint) s.s_magic[3]) << 24))
+#define vxfsmagic(s) assemble4le(s.s_magic)
#define VXFS_SUPER_MAGIC 0xa501FCF5
struct jfs_super_block {
@@ -200,14 +187,26 @@ struct jfs_super_block {
#define JFS_SUPER1_OFF 0x8000
#define JFS_MAGIC "JFS1"
-#define SYSV_SUPER_MAGIC 0xfd187e20
-
struct sysv_super_block {
u_char s_dummy1[504];
u_char s_magic[4];
u_char type[4];
};
+#define sysvmagic(s) assemble4le(s.s_magic)
+#define SYSV_SUPER_MAGIC 0xfd187e20
+
+struct mdp_super_block {
+ u_char md_magic[4];
+};
+#define MD_SB_MAGIC 0xa92b4efc
+#define mdsbmagic(s) assemble4le(s.md_magic)
+
+static inline int
+assemble2le(unsigned char *p) {
+ return (p[0] | (p[1] << 8));
+}
-#define sysvmagic(s) ((uint) s.s_magic[0] + (((uint) s.s_magic[1]) << 8) + \
- (((uint) s.s_magic[2]) << 16) + \
- (((uint) s.s_magic[3]) << 24))
+static inline int
+assemble4le(unsigned char *p) {
+ return (p[0] | (p[1] << 8) | (p[2] << 16) | (p[3] << 24));
+}
diff --git a/mount/mount.8 b/mount/mount.8
index 7f2f4d932..763e8fca7 100644
--- a/mount/mount.8
+++ b/mount/mount.8
@@ -548,6 +548,11 @@ effect.
.B sync
All I/O to the file system should be done synchronously.
.TP
+.B dirsync
+All directory updates within the file system should be done synchronously.
+This affects the following system calls: creat, link, unlink, symlink,
+mkdir, rmdir, mknod and rename.
+.TP
.B user
Allow an ordinary user to mount the file system.
The name of the mounting user is written to mtab so that he can unmount
@@ -1125,8 +1130,8 @@ For details, see
Especially useful options include
.TP
.B rsize=8192,wsize=8192
-This will make your nfs connection much faster than with the default
-buffer size of 1024. (NFSv2 does not work with larger values of
+This will make your nfs connection faster than with the default
+buffer size of 4096. (NFSv2 does not work with larger values of
.B rsize
and
.BR wsize .)
@@ -1175,6 +1180,7 @@ 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.
+The umask value is given in octal.
By default, the files are owned by root and not readable by somebody else.
.SH "Mount options for proc"
@@ -1316,6 +1322,7 @@ Set the default group.
.TP
.B umask=
Set the default umask.
+The value is given in octal.
.TP
.B uid=
Set the default user.
@@ -1661,7 +1668,7 @@ temporary file
It is possible for a corrupted file system to cause a crash.
.PP
Some Linux file systems don't support
-.B "\-o sync"
+.B "\-o sync and \-o dirsync"
(the ext2 and ext3 file systems
.I do
support synchronous updates (a la BSD) when mounted with the
diff --git a/mount/mount.c b/mount/mount.c
index 125cf1abf..fb1ca716f 100644
--- a/mount/mount.c
+++ b/mount/mount.c
@@ -94,7 +94,7 @@ int sloppy = 0;
static int readwrite = 0;
/* True for all mount (-a). */
-int all = 0;
+int mount_all = 0;
/* True for fork() during all mount (-F). */
static int optfork = 0;
@@ -148,6 +148,7 @@ static const struct opt_map opt_map[] = {
{ "nodev", 0, 0, MS_NODEV }, /* don't interpret devices */
{ "sync", 0, 0, MS_SYNCHRONOUS}, /* synchronous I/O */
{ "async", 0, 1, MS_SYNCHRONOUS}, /* asynchronous I/O */
+ { "dirsync", 0, 0, MS_DIRSYNC}, /* synchronous directory modifications */
{ "remount", 0, 0, MS_REMOUNT}, /* Alter flags of mounted FS */
{ "bind", 0, 0, MS_BIND }, /* Remount part of tree elsewhere */
{ "auto", 0, 1, MS_NOAUTO }, /* Can be mounted using -a */
@@ -201,25 +202,25 @@ static struct string_opt_map {
static void
clear_string_opts(void) {
- struct string_opt_map *m;
+ struct string_opt_map *m;
- for (m = &string_opt_map[0]; m->tag; m++)
- *(m->valptr) = NULL;
+ for (m = &string_opt_map[0]; m->tag; m++)
+ *(m->valptr) = NULL;
}
static int
parse_string_opt(char *s) {
- struct string_opt_map *m;
- int lth;
-
- for (m = &string_opt_map[0]; m->tag; m++) {
- lth = strlen(m->tag);
- if (!strncmp(s, m->tag, lth)) {
- *(m->valptr) = xstrdup(s + lth);
- return 1;
- }
- }
- return 0;
+ struct string_opt_map *m;
+ int lth;
+
+ for (m = &string_opt_map[0]; m->tag; m++) {
+ lth = strlen(m->tag);
+ if (!strncmp(s, m->tag, lth)) {
+ *(m->valptr) = xstrdup(s + lth);
+ return 1;
+ }
+ }
+ return 0;
}
int mount_quiet=0;
@@ -264,54 +265,54 @@ print_all (char *types) {
*/
static inline void
parse_opt (const char *opt, int *mask, char *extra_opts) {
- const struct opt_map *om;
-
- for (om = opt_map; om->opt != NULL; om++)
- if (streq (opt, om->opt)) {
- if (om->inv)
- *mask &= ~om->mask;
- else
- *mask |= om->mask;
- if ((om->mask == MS_USER || om->mask == MS_USERS)
- && !om->inv)
- *mask |= MS_SECURE;
- if ((om->mask == MS_OWNER) && !om->inv)
- *mask |= MS_OWNERSECURE;
+ const struct opt_map *om;
+
+ for (om = opt_map; om->opt != NULL; om++)
+ if (streq (opt, om->opt)) {
+ if (om->inv)
+ *mask &= ~om->mask;
+ else
+ *mask |= om->mask;
+ 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;
- verbose = 0;
- }
+ if (om->mask == MS_SILENT && om->inv) {
+ mount_quiet = 1;
+ verbose = 0;
+ }
#endif
- return;
- }
+ return;
+ }
- if (*extra_opts)
- strcat(extra_opts, ",");
+ if (*extra_opts)
+ strcat(extra_opts, ",");
- /* convert nonnumeric ids to numeric */
- if (!strncmp(opt, "uid=", 4) && !isdigit(opt[4])) {
- struct passwd *pw = getpwnam(opt+4);
- char uidbuf[20];
+ /* convert nonnumeric ids to numeric */
+ if (!strncmp(opt, "uid=", 4) && !isdigit(opt[4])) {
+ struct passwd *pw = getpwnam(opt+4);
+ char uidbuf[20];
- if (pw) {
- sprintf(uidbuf, "uid=%d", pw->pw_uid);
- strcat(extra_opts, uidbuf);
- return;
- }
- }
- if (!strncmp(opt, "gid=", 4) && !isdigit(opt[4])) {
- struct group *gr = getgrnam(opt+4);
- char gidbuf[20];
-
- if (gr) {
- sprintf(gidbuf, "gid=%d", gr->gr_gid);
- strcat(extra_opts, gidbuf);
- return;
- }
- }
+ if (pw) {
+ sprintf(uidbuf, "uid=%d", pw->pw_uid);
+ strcat(extra_opts, uidbuf);
+ return;
+ }
+ }
+ if (!strncmp(opt, "gid=", 4) && !isdigit(opt[4])) {
+ struct group *gr = getgrnam(opt+4);
+ char gidbuf[20];
+
+ if (gr) {
+ sprintf(gidbuf, "gid=%d", gr->gr_gid);
+ strcat(extra_opts, gidbuf);
+ return;
+ }
+ }
- strcat(extra_opts, opt);
+ strcat(extra_opts, opt);
}
/* Take -o options list and compute 4th and 5th args to mount(2). flags
@@ -344,30 +345,31 @@ parse_opts (char *opts, int *flags, char **extra_opts) {
/* Try to build a canonical options string. */
static char *
fix_opts_string (int flags, const char *extra_opts, const char *user) {
- const struct opt_map *om;
- const struct string_opt_map *m;
- char *new_opts;
-
- new_opts = (flags & MS_RDONLY) ? "ro" : "rw";
- for (om = opt_map; om->opt != NULL; om++) {
- if (om->skip)
- continue;
- if (om->inv || !om->mask || (flags & om->mask) != om->mask)
- continue;
- new_opts = xstrconcat3(new_opts, ",", om->opt);
- flags &= ~om->mask;
- }
- for (m = &string_opt_map[0]; m->tag; m++) {
- if (!m->skip && *(m->valptr))
- new_opts = xstrconcat4(new_opts, ",", m->tag, *(m->valptr));
- }
- if (extra_opts && *extra_opts) {
- new_opts = xstrconcat3(new_opts, ",", extra_opts);
- }
- if (user) {
- new_opts = xstrconcat3(new_opts, ",user=", user);
- }
- return new_opts;
+ const struct opt_map *om;
+ const struct string_opt_map *m;
+ char *new_opts;
+
+ new_opts = (flags & MS_RDONLY) ? "ro" : "rw";
+ for (om = opt_map; om->opt != NULL; om++) {
+ if (om->skip)
+ continue;
+ if (om->inv || !om->mask || (flags & om->mask) != om->mask)
+ continue;
+ new_opts = xstrconcat3(new_opts, ",", om->opt);
+ flags &= ~om->mask;
+ }
+ for (m = &string_opt_map[0]; m->tag; m++) {
+ if (!m->skip && *(m->valptr))
+ new_opts = xstrconcat4(new_opts, ",",
+ m->tag, *(m->valptr));
+ }
+ if (extra_opts && *extra_opts) {
+ new_opts = xstrconcat3(new_opts, ",", extra_opts);
+ }
+ if (user) {
+ new_opts = xstrconcat3(new_opts, ",user=", user);
+ }
+ return new_opts;
}
static int
@@ -757,12 +759,12 @@ try_mount_one (const char *spec0, const char *node0, char *types0,
parse_opts (xstrdup (opts), &flags, &extra_opts);
- suid_check (spec, node, &flags, &user);
-
/* quietly succeed for fstab entries that don't get mounted automatically */
- if (all && (flags & MS_NOAUTO))
+ if (mount_all && (flags & MS_NOAUTO))
return 0;
+ suid_check (spec, node, &flags, &user);
+
mount_opts = extra_opts;
if (opt_speed)
@@ -872,7 +874,7 @@ retry_nfs:
/* heuristic: if /proc/version exists, then probably proc is mounted */
if (stat ("/proc/version", &statbuf)) /* proc mounted? */
error (_("mount: %s is busy"), node); /* no */
- else if(!all || verbose) /* yes, don't mention it */
+ else if (!mount_all || verbose) /* yes, don't mention it */
error (_("mount: proc already mounted"));
} else {
error (_("mount: %s already mounted or %s busy"), spec, node);
@@ -1095,10 +1097,11 @@ mount_one (const char *spec, const char *node, char *types, const char *opts,
specset = 1;
nspec = get_spec_by_uuid(spec+5);
} else if (!strncmp(spec, "LABEL=", 6)) {
- const char *nspec2;
+ const char *nspec2 = NULL;
specset = 2;
nspec = get_spec_by_volume_label(spec+6);
- nspec2 = second_occurrence_of_vol_label(spec+6);
+ if (nspec)
+ nspec2 = second_occurrence_of_vol_label(spec+6);
if (nspec2) {
if (verbose)
printf(_("mount: the label %s occurs on "
@@ -1117,7 +1120,7 @@ mount_one (const char *spec, const char *node, char *types, const char *opts,
if (verbose > 1)
printf(_("mount: going to mount %s by %s\n"), spec,
(specset==1) ? _("UUID") : _("label"));
- } else if(!all)
+ } else if(!mount_all)
die (EX_USAGE, _("mount: no such partition found"));
/* if -a then we may be rescued by a noauto option */
}
@@ -1128,6 +1131,11 @@ mount_one (const char *spec, const char *node, char *types, const char *opts,
if (verbose)
printf(_("mount: no type was given - "
"I'll assume nfs because of the colon\n"));
+ } else if(!strncmp(spec, "//", 2)) {
+ types = "smb";
+ if (verbose)
+ printf(_("mount: no type was given - "
+ "I'll assume smb because of the // prefix\n"));
}
}
@@ -1181,6 +1189,19 @@ mounted (char *spec, char *node) {
return 0;
}
+/* avoid using stat() on things we are not going to mount anyway.. */
+static int
+has_noauto (char *opts) {
+ char *s;
+
+ if (!opts)
+ return 0;
+ s = strstr(opts, "noauto");
+ if (!s)
+ return 0;
+ return (s == opts || s[-1] == ',') && (s[6] == 0 || s[6] == ',');
+}
+
/* Mount all filesystems of the specified types except swap and root. */
/* With the --fork option: fork and let different incarnations of
mount handle different filesystems. However, try to avoid several
@@ -1188,118 +1209,131 @@ mounted (char *spec, char *node) {
#define DISKMAJOR(m) (((int) m) & ~0xf)
static int
-mount_all (char *types, char *options) {
- struct mntentchn *mc, *mc0, *mtmp;
- int status = 0;
- struct stat statbuf;
- struct child {
- pid_t pid;
- char *group;
- struct mntentchn *mec;
- struct mntentchn *meclast;
- struct child *nxt;
- } childhead, *childtail, *cp;
- char major[22];
- char *g, *colon;
-
- /* build a chain of what we have to do, or maybe
- several chains, one for each major or NFS host */
- childhead.nxt = 0;
- childtail = &childhead;
- mc0 = fstab_head();
- for (mc = mc0->nxt; mc && mc != mc0; mc = mc->nxt) {
- if (matching_type (mc->m.mnt_type, types)
- && !streq (mc->m.mnt_dir, "/")
- && !streq (mc->m.mnt_dir, "root")) {
- if (mounted (mc->m.mnt_fsname, mc->m.mnt_dir)) {
- if (verbose)
- printf(_("mount: %s already mounted on %s\n"),
- mc->m.mnt_fsname, mc->m.mnt_dir);
- } else {
- mtmp = (struct mntentchn *) xmalloc(sizeof(*mtmp));
- *mtmp = *mc;
- mtmp->nxt = 0;
- g = NULL;
- if (optfork) {
- if (stat(mc->m.mnt_fsname, &statbuf) == 0 &&
- S_ISBLK(statbuf.st_mode)) {
- sprintf(major, "#%x", DISKMAJOR(statbuf.st_rdev));
- g = major;
- }
+do_mount_all (char *types, char *options) {
+ struct mntentchn *mc, *mc0, *mtmp;
+ int status = 0;
+ struct stat statbuf;
+ struct child {
+ pid_t pid;
+ char *group;
+ struct mntentchn *mec;
+ struct mntentchn *meclast;
+ struct child *nxt;
+ } childhead, *childtail, *cp;
+ char major[22];
+ char *g, *colon;
+
+ /* build a chain of what we have to do, or maybe
+ several chains, one for each major or NFS host */
+ childhead.nxt = 0;
+ childtail = &childhead;
+ mc0 = fstab_head();
+ for (mc = mc0->nxt; mc && mc != mc0; mc = mc->nxt) {
+ if (has_noauto (mc->m.mnt_opts))
+ continue;
+ if (matching_type (mc->m.mnt_type, types)
+ && !streq (mc->m.mnt_dir, "/")
+ && !streq (mc->m.mnt_dir, "root")) {
+
+ if (mounted (mc->m.mnt_fsname, mc->m.mnt_dir)) {
+ if (verbose)
+ printf(_("mount: %s already mounted "
+ "on %s\n"),
+ mc->m.mnt_fsname,
+ mc->m.mnt_dir);
+ continue;
+ }
+
+ mtmp = (struct mntentchn *) xmalloc(sizeof(*mtmp));
+ *mtmp = *mc;
+ mtmp->nxt = 0;
+ g = NULL;
+ if (optfork) {
+ if (stat(mc->m.mnt_fsname, &statbuf) == 0 &&
+ S_ISBLK(statbuf.st_mode)) {
+ sprintf(major, "#%x",
+ DISKMAJOR(statbuf.st_rdev));
+ g = major;
+ }
#ifdef HAVE_NFS
- if (strcmp(mc->m.mnt_type, "nfs") == 0) {
- g = xstrdup(mc->m.mnt_fsname);
- colon = strchr(g, ':');
- if (colon)
- *colon = '\0';
- }
+ if (strcmp(mc->m.mnt_type, "nfs") == 0) {
+ g = xstrdup(mc->m.mnt_fsname);
+ colon = strchr(g, ':');
+ if (colon)
+ *colon = '\0';
+ }
#endif
- }
- if (g) {
- for (cp = childhead.nxt; cp; cp = cp->nxt)
- if (cp->group && strcmp(cp->group, g) == 0) {
- cp->meclast->nxt = mtmp;
- cp->meclast = mtmp;
- goto fnd;
- }
- }
- cp = (struct child *) xmalloc(sizeof *cp);
- cp->nxt = 0;
- cp->mec = cp->meclast = mtmp;
- cp->group = xstrdup(g);
- cp->pid = 0;
- childtail->nxt = cp;
- childtail = cp;
- fnd:;
- }
- }
- }
+ }
+ if (g) {
+ for (cp = childhead.nxt; cp; cp = cp->nxt)
+ if (cp->group &&
+ strcmp(cp->group, g) == 0) {
+ cp->meclast->nxt = mtmp;
+ cp->meclast = mtmp;
+ goto fnd;
+ }
+ }
+ cp = (struct child *) xmalloc(sizeof *cp);
+ cp->nxt = 0;
+ cp->mec = cp->meclast = mtmp;
+ cp->group = xstrdup(g);
+ cp->pid = 0;
+ childtail->nxt = cp;
+ childtail = cp;
+ fnd:;
+
+ }
+ }
- /* now do everything */
- for (cp = childhead.nxt; cp; cp = cp->nxt) {
- pid_t p = -1;
- if (optfork) {
- p = fork();
- if (p == -1) {
- int errsv = errno;
- error(_("mount: cannot fork: %s"), strerror (errsv));
- }
- else if (p != 0)
- cp->pid = p;
- }
+ /* now do everything */
+ for (cp = childhead.nxt; cp; cp = cp->nxt) {
+ pid_t p = -1;
+ if (optfork) {
+ p = fork();
+ if (p == -1) {
+ int errsv = errno;
+ error(_("mount: cannot fork: %s"),
+ strerror (errsv));
+ }
+ else if (p != 0)
+ cp->pid = p;
+ }
- /* if child, or not forked, do the mounting */
- if (p == 0 || p == -1) {
- for (mc = cp->mec; mc; mc = mc->nxt)
- status |= mount_one (mc->m.mnt_fsname, mc->m.mnt_dir,
- mc->m.mnt_type, mc->m.mnt_opts,
- options, 0, 0);
- if (mountcount)
- status |= EX_SOMEOK;
- if (p == 0)
- exit(status);
- }
- }
+ /* if child, or not forked, do the mounting */
+ if (p == 0 || p == -1) {
+ for (mc = cp->mec; mc; mc = mc->nxt) {
+ status |= mount_one (mc->m.mnt_fsname,
+ mc->m.mnt_dir,
+ mc->m.mnt_type,
+ mc->m.mnt_opts,
+ options, 0, 0);
+ }
+ if (mountcount)
+ status |= EX_SOMEOK;
+ if (p == 0)
+ exit(status);
+ }
+ }
- /* wait for children, if any */
- while ((cp = childhead.nxt) != NULL) {
- childhead.nxt = cp->nxt;
- if (cp->pid) {
- int ret;
- keep_waiting:
- if(waitpid(cp->pid, &ret, 0) == -1) {
- if (errno == EINTR)
- goto keep_waiting;
- perror("waitpid");
- } else if (WIFEXITED(ret))
- status |= WEXITSTATUS(ret);
- else
- status |= EX_SYSERR;
- }
- }
- if (mountcount)
- status |= EX_SOMEOK;
- return status;
+ /* wait for children, if any */
+ while ((cp = childhead.nxt) != NULL) {
+ childhead.nxt = cp->nxt;
+ if (cp->pid) {
+ int ret;
+ keep_waiting:
+ if(waitpid(cp->pid, &ret, 0) == -1) {
+ if (errno == EINTR)
+ goto keep_waiting;
+ perror("waitpid");
+ } else if (WIFEXITED(ret))
+ status |= WEXITSTATUS(ret);
+ else
+ status |= EX_SYSERR;
+ }
+ }
+ if (mountcount)
+ status |= EX_SOMEOK;
+ return status;
}
extern char version[];
@@ -1391,10 +1425,10 @@ main (int argc, char *argv[]) {
while ((c = getopt_long (argc, argv, "afFhlL:no:rsU:vVwt:",
longopts, NULL)) != -1) {
switch (c) {
- case 'a': /* mount everything in fstab */
- ++all;
+ case 'a': /* mount everything in fstab */
+ ++mount_all;
break;
- case 'f': /* fake: don't actually call mount(2) */
+ case 'f': /* fake: don't actually call mount(2) */
++fake;
break;
case 'F':
@@ -1484,7 +1518,7 @@ main (int argc, char *argv[]) {
specseen = (uuid || volumelabel) ? 1 : 0; /* yes, .. i know */
- if (argc+specseen == 0 && !all) {
+ if (argc+specseen == 0 && !mount_all) {
if (options || mounttype)
usage (stderr, EX_USAGE);
return print_all (types);
@@ -1492,7 +1526,7 @@ main (int argc, char *argv[]) {
if (getuid () != geteuid ()) {
suid = 1;
- if (types || options || readwrite || nomtab || all ||
+ if (types || options || readwrite || nomtab || mount_all ||
fake || mounttype || (argc + specseen) != 1)
die (EX_USAGE, _("mount: only root can do that"));
}
@@ -1527,7 +1561,7 @@ main (int argc, char *argv[]) {
switch (argc+specseen) {
case 0:
/* mount -a */
- result = mount_all (types, options);
+ result = do_mount_all (types, options);
if (result == 0 && verbose)
error(_("nothing was mounted"));
break;
diff --git a/mount/mount_by_label.c b/mount/mount_by_label.c
index ee3b1d52e..2ae351d10 100644
--- a/mount/mount_by_label.c
+++ b/mount/mount_by_label.c
@@ -39,6 +39,30 @@ static struct uuidCache_s {
char *device;
} *uuidCache = NULL;
+/*
+ * See whether this device has (the magic of) a RAID superblock at the end.
+ * If so, it probably is, or has been, part of a RAID array.
+ */
+static int
+is_raid_partition(int fd) {
+ struct mdp_super_block mdsb;
+ int n;
+
+ /* hardcode 4096 here in various places, because that's
+ what it's defined to be. Note that even if we used
+ the actual kernel headers, sizeof(mdp_super_t) is
+ slightly larger in the 2.2 kernel on 64-bit archs,
+ so using that wouldn't work. */
+ lseek(fd, -4096, SEEK_END); /* Ignore possible error
+ about return value overflow */
+ n = 4096;
+ if (sizeof(mdsb) < n)
+ n = sizeof(mdsb);
+ if (read(fd, &mdsb, n) != n)
+ return 1; /* error */
+ return (mdsbmagic(mdsb) == MD_SB_MAGIC);
+}
+
/* for now, only ext2, ext3 and xfs are supported */
static int
get_label_uuid(const char *device, char **label, char *uuid) {
@@ -56,6 +80,12 @@ get_label_uuid(const char *device, char **label, char *uuid) {
if (fd < 0)
return rv;
+ /* If there is a RAID partition, or an error, ignore this partition */
+ if (is_raid_partition(fd)) {
+ close(fd);
+ return rv;
+ }
+
if (lseek(fd, 1024, SEEK_SET) == 1024
&& read(fd, (char *) &e2sb, sizeof(e2sb)) == sizeof(e2sb)
&& (ext2magic(e2sb) == EXT2_SUPER_MAGIC)) {
diff --git a/mount/mount_constants.h b/mount/mount_constants.h
index cdbced881..1eab36e03 100644
--- a/mount/mount_constants.h
+++ b/mount/mount_constants.h
@@ -19,6 +19,10 @@
#ifndef MS_MANDLOCK
#define MS_MANDLOCK 64 /* Allow mandatory locks on an FS */
#endif
+#ifndef MS_DIRSYNC
+#define MS_DIRSYNC 128 /* Directory modifications are synchronous */
+#endif
+
#ifndef MS_ACTION_MASK
#define MS_ACTION_MASK 0x380
/* Remount, but new filesystem may be different from old. Atomic
diff --git a/mount/mount_guess_fstype.c b/mount/mount_guess_fstype.c
index 63b00ba83..23a116859 100644
--- a/mount/mount_guess_fstype.c
+++ b/mount/mount_guess_fstype.c
@@ -60,11 +60,6 @@ swapped(unsigned short a) {
return (a>>8) | (a<<8);
}
-static inline int
-assemble4le(unsigned char *p) {
- return (p[0] | (p[1] << 8) | (p[2] << 16) | (p[3] << 24));
-}
-
/*
char *guess_fstype(const char *device);
diff --git a/mount/nfs.5 b/mount/nfs.5
index d2165b853..3f1776606 100644
--- a/mount/nfs.5
+++ b/mount/nfs.5
@@ -144,7 +144,8 @@ for hosts that can run multiple NFS servers.
The default value is version 2.
.TP 1.5i
.I nolock
-Disable NFS locking. This has to be used with some old NFS servers
+Disable NFS locking. Do not start lockd.
+This has to be used with some old NFS servers
that don't support locking.
.TP 1.5i
.I bg
@@ -196,9 +197,6 @@ server performance penalty but it allows two different NFS clients
to get reasonable good results when both clients are actively
writing to common filesystem on the server.
.TP 1.5i
-.I nolock
-Do not use locking. Do not start lockd.
-.TP 1.5i
.I tcp
Mount the NFS filesystem using the TCP protocol instead of the
default UDP protocol. Many NFS servers only support UDP.
diff --git a/mount/pivot_root.c b/mount/pivot_root.c
index 674271ad2..faa0e4d50 100644
--- a/mount/pivot_root.c
+++ b/mount/pivot_root.c
@@ -15,15 +15,15 @@ static
_syscall2(int,pivot_root,const char *,new_root,const char *,put_old)
#endif
-int main(int argc,const char **argv)
+int main(int argc, const char **argv)
{
- if (argc != 3) {
- fprintf(stderr,"usage: %s new_root put_old\n",argv[0]);
- return 1;
- }
- if (pivot_root(argv[1],argv[2]) < 0) {
- perror("pivot_root");
- return 1;
- }
- return 0;
+ if (argc != 3) {
+ fprintf(stderr, "usage: %s new_root put_old\n", argv[0]);
+ return 1;
+ }
+ if (pivot_root(argv[1],argv[2]) < 0) {
+ perror("pivot_root");
+ return 1;
+ }
+ return 0;
}
diff --git a/mount/sundries.h b/mount/sundries.h
index 5b91ca1ee..788bef645 100644
--- a/mount/sundries.h
+++ b/mount/sundries.h
@@ -22,7 +22,6 @@ extern int sloppy;
/* Functions in sundries.c that are used in mount.c and umount.c */
void block_signals (int how);
char *canonicalize (const char *path);
-char *realpath (const char *path, char *resolved_path);
void error (const char *fmt, ...);
int matching_type (const char *type, const char *types);
void *xmalloc (size_t size);
diff --git a/mount/swapon.8 b/mount/swapon.8
index 61cd3b375..4e03cf383 100644
--- a/mount/swapon.8
+++ b/mount/swapon.8
@@ -74,10 +74,8 @@ Provide help
Display version
.TP
.B \-s
-Display swap usage summary by device.
-This option is only available if
-.I /proc/swaps
-exists (probably not before kernel 2.1.25).
+Display swap usage summary by device. Equivalent to "cat /proc/swaps".
+Not available before Linux 2.1.25.
.TP
.B \-a
All devices marked as ``sw'' swap devices in
@@ -101,12 +99,14 @@ for use with
.BR "swapon -a" .
.PP
.B Swapoff
-disables swapping on the specified devices and files, or on all swap
-entries in
-.I /etc/fstab
-when the
+disables swapping on the specified devices and files.
+When the
.B \-a
-flag is given.
+flag is given, swapping is disabled on all known swap devices and files
+(as found in
+.I /proc/swaps
+or
+.IR /etc/fstab ).
.SH NOTE
You should not use
.B swapon
diff --git a/mount/swapon.c b/mount/swapon.c
index 29c859dbc..c2ae20a9e 100644
--- a/mount/swapon.c
+++ b/mount/swapon.c
@@ -1,13 +1,13 @@
/*
* A swapon(8)/swapoff(8) for Linux 0.99.
* swapon.c,v 1.1.1.1 1993/11/18 08:40:51 jrs Exp
- * Added '-s' (Summary option) <Vincent.Renardias@waw.com> 02/1997.
*
+ * 1997-02-xx <Vincent.Renardias@waw.com>
+ * - added '-s' (summary option)
* 1999-02-22 Arkadiusz Mi¶kiewicz <misiek@pld.ORG.PL>
* - added Native Language Support
- * Sun Mar 21 1999 - Arnaldo Carvalho de Melo <acme@conectiva.com.br>
+ * 1999-03-21 Arnaldo Carvalho de Melo <acme@conectiva.com.br>
* - fixed strerr(errno) in gettext calls
- *
*/
#include <stdlib.h>
@@ -28,32 +28,46 @@
#define SWAPON_NEEDS_TWO_ARGS
-/* Nonzero for chatty (-v). This is a nonstandard flag (not in BSD). */
+#define QUIET 1
+
+int all = 0;
int verbose = 0;
int priority = -1; /* non-prioritized swap by default */
extern char version[];
static char *program_name;
-static struct option longopts[] =
-{
- { "all", 0, 0, 'a' },
- { "help", 0, 0, 'h' },
- { "priority", required_argument, 0, 'p' },
- { "summary", 0, 0, 's' },
- { "verbose", 0, 0, 'v' },
- { "version", 0, 0, 'V' },
- { NULL, 0, 0, 0 }
+
+static struct option longswaponopts[] = {
+ /* swapon only */
+ { "priority", required_argument, 0, 'p' },
+ { "summary", 0, 0, 's' },
+ /* also for swapoff */
+ { "all", 0, 0, 'a' },
+ { "help", 0, 0, 'h' },
+ { "verbose", 0, 0, 'v' },
+ { "version", 0, 0, 'V' },
+ { NULL, 0, 0, 0 }
};
+static struct option *longswapoffopts = &longswaponopts[2];
+
static void
-usage (FILE *fp, int n)
-{
- fprintf (fp, _("usage: %s [-hV]\n"
- " %s -a [-v]\n"
- " %s [-v] [-p priority] special ...\n"
- " %s [-s]\n"),
- program_name, program_name, program_name, program_name);
- exit (n);
+swapon_usage(FILE *fp, int n) {
+ fprintf(fp, _("usage: %s [-hV]\n"
+ " %s -a [-v]\n"
+ " %s [-v] [-p priority] special ...\n"
+ " %s [-s]\n"),
+ program_name, program_name, program_name, program_name);
+ exit(n);
+}
+
+static void
+swapoff_usage(FILE *fp, int n) {
+ fprintf(fp, _("usage: %s [-hV]\n"
+ " %s -a [-v]\n"
+ " %s [-v] special ...\n"),
+ program_name, program_name, program_name);
+ exit(n);
}
#ifdef SWAPON_HAS_TWO_ARGS
@@ -78,168 +92,326 @@ _syscall1(int, swapoff, const char *, path);
#include <unistd.h>
#endif
-static int
-swap (const char *special, int prio)
-{
- int status;
- struct stat st;
- if (verbose)
- printf(_("%s on %s\n"), program_name, special);
+/*
+ * contents of /proc/swaps
+ */
+static int numSwaps;
+static char **swapFiles; /* array of swap file and partition names */
- if (streq (program_name, "swapon")) {
- if (stat(special, &st) < 0) {
- int errsv = errno;
- fprintf (stderr, _("swapon: cannot stat %s: %s\n"),
- special, strerror (errsv));
- return -1;
- }
-
- /* people generally dislike this warning - now it is printed
- only when `verbose' is set */
- if (verbose) {
- int permMask = (S_ISBLK(st.st_mode) ? 07007 : 07077);
-
- if ((st.st_mode & permMask) != 0) {
- fprintf(stderr,
- _("swapon: warning: %s has insecure permissions %04o, "
- "%04o suggested\n"),
- special, st.st_mode & 07777, ~permMask & 0666);
- }
- }
-
- /* test for holes by LBT */
- if (S_ISREG(st.st_mode)) {
- if (st.st_blocks * 512 < st.st_size) {
- fprintf(stderr,
- _("swapon: Skipping file %s - it appears to have holes.\n"),
- special);
- return -1;
- }
- }
+static void
+read_proc_swaps(void) {
+ FILE *swaps;
+ char line[1024];
+ char *p;
-#ifdef SWAPON_NEEDS_TWO_ARGS
- {
- int flags = 0;
+ numSwaps = 0;
+ swapFiles = NULL;
-#ifdef SWAP_FLAG_PREFER
- if (prio >= 0) {
- if (prio > SWAP_FLAG_PRIO_MASK)
- prio = SWAP_FLAG_PRIO_MASK;
- flags = SWAP_FLAG_PREFER
- | ((prio & SWAP_FLAG_PRIO_MASK) << SWAP_FLAG_PRIO_SHIFT);
- }
-#endif
- status = swapon (special, flags);
- }
-#else
- status = swapon (special);
-#endif
- } else
- status = swapoff (special);
+ swaps = fopen(PROC_SWAPS, "r");
+ if (swaps == NULL)
+ return; /* nothing wrong */
+
+ /* skip the first line */
+ fgets(line, sizeof(line), swaps);
- if (status < 0) {
- int errsv = errno;
- fprintf (stderr, "%s: %s: %s\n", program_name, special, strerror (errsv));
- }
+ while (fgets(line, sizeof(line), swaps)) {
+ /*
+ * Cut the line "swap_device ... more info" after device.
+ * This will fail with names with embedded spaces.
+ */
+ for (p = line; *p && *p != ' '; p++);
+ *p = 0;
- return status;
+ numSwaps++;
+ swapFiles = realloc(swapFiles,
+ numSwaps * sizeof(*swapFiles));
+ swapFiles[numSwaps-1] = strdup(line);
+ }
+ fclose(swaps);
+}
+
+static int
+is_in_proc_swaps(char *fname) {
+ int i;
+
+ for (i = 0; i < numSwaps; i++)
+ if (!strcmp(fname, swapFiles[i]))
+ return 1;
+ return 0;
}
static int
display_summary(void)
{
FILE *swaps;
- char line[200] ;
+ char line[1024] ;
if ((swaps = fopen(PROC_SWAPS, "r")) == NULL) {
int errsv = errno;
- fprintf (stderr, "%s: %s: %s\n", program_name, PROC_SWAPS,
- strerror (errsv));
+ fprintf(stderr, "%s: %s: %s\n", program_name, PROC_SWAPS,
+ strerror(errsv));
return -1 ;
}
- while ( fgets(line, sizeof(line), swaps))
- printf ("%s", line);
+ while (fgets(line, sizeof(line), swaps))
+ printf("%s", line);
fclose(swaps);
return 0 ;
}
-int
-main (int argc, char *argv[])
-{
- struct mntent *fstab;
- int status;
- int all = 0;
- int c;
-
- setlocale(LC_ALL, "");
- bindtextdomain(PACKAGE, LOCALEDIR);
- textdomain(PACKAGE);
-
- if (strrchr (argv[0], '/') != NULL)
- program_name = strrchr (argv[0], '/') + 1;
- else
- program_name = argv[0];
-
- while ((c = getopt_long (argc, argv, "ahp:svV", longopts, NULL)) != -1)
- switch (c)
- {
- case 'a': /* all */
- ++all;
- break;
- case 'h': /* help */
- usage (stdout, 0);
- break;
- case 'p': /* priority */
- priority = atoi(optarg);
- break;
- case 's': /* tell about current use of swap areas */
- status = display_summary();
- exit(status);
- case 'v': /* be chatty */
- ++verbose;
- break;
- case 'V': /* version */
- printf ("%s: %s\n", program_name, version);
- exit (0);
- case 0:
- break;
- case '?':
- default:
- usage (stderr, 1);
- }
-
- argv += optind;
-
- status = 0;
-
- if (all) {
- FILE *fp = setmntent(_PATH_FSTAB, "r");
- if (fp == NULL) {
- int errsv = errno;
- fprintf(stderr, _("%s: cannot open %s: %s\n"), program_name,
- _PATH_FSTAB, strerror(errsv));
- exit(2);
- }
- while ((fstab = getmntent(fp)) != NULL) {
- if (streq (fstab->mnt_type, MNTTYPE_SWAP)) {
- /* parse mount options; */
- char *opt, *opts = strdup(fstab->mnt_opts);
+static int
+do_swapon(const char *special, int prio) {
+ int status;
+ struct stat st;
+
+ if (verbose)
+ printf(_("%s on %s\n"), program_name, special);
+
+ if (stat(special, &st) < 0) {
+ int errsv = errno;
+ fprintf(stderr, _("swapon: cannot stat %s: %s\n"),
+ special, strerror(errsv));
+ return -1;
+ }
+
+ /* people generally dislike this warning - now it is printed
+ only when `verbose' is set */
+ if (verbose) {
+ int permMask = (S_ISBLK(st.st_mode) ? 07007 : 07077);
+
+ if ((st.st_mode & permMask) != 0) {
+ fprintf(stderr, _("swapon: warning: %s has "
+ "insecure permissions %04o, "
+ "%04o suggested\n"),
+ special, st.st_mode & 07777,
+ ~permMask & 0666);
+ }
+ }
+
+ /* test for holes by LBT */
+ if (S_ISREG(st.st_mode)) {
+ if (st.st_blocks * 512 < st.st_size) {
+ fprintf(stderr,
+ _("swapon: Skipping file %s - it appears "
+ "to have holes.\n"),
+ special);
+ return -1;
+ }
+ }
+
+#ifdef SWAPON_NEEDS_TWO_ARGS
+ {
+ int flags = 0;
+
+#ifdef SWAP_FLAG_PREFER
+ if (prio >= 0) {
+ if (prio > SWAP_FLAG_PRIO_MASK)
+ prio = SWAP_FLAG_PRIO_MASK;
+ flags = SWAP_FLAG_PREFER
+ | ((prio & SWAP_FLAG_PRIO_MASK)
+ << SWAP_FLAG_PRIO_SHIFT);
+ }
+#endif
+ status = swapon(special, flags);
+ }
+#else
+ status = swapon(special);
+#endif
+ if (status < 0) {
+ int errsv = errno;
+ fprintf(stderr, "%s: %s: %s\n", program_name,
+ special, strerror(errsv));
+ }
+
+ return status;
+}
+
+static int
+do_swapoff(const char *special, int quiet) {
+ if (verbose)
+ printf(_("%s on %s\n"), program_name, special);
+
+ if (swapoff(special) == 0)
+ return 0; /* success */
+
+ if (errno == EPERM) {
+ fprintf(stderr, _("Not superuser.\n"));
+ exit(1); /* any further swapoffs will also fail */
+ }
+
+ if (!quiet) {
+ int errsv = errno;
+ fprintf(stderr, "%s: %s: %s\n", program_name,
+ special, strerror(errsv));
+ }
+ return -1;
+}
+
+static int
+main_swapon(int argc, char *argv[]) {
+ FILE *fp;
+ struct mntent *fstab;
+ int status = 0;
+ int c;
+
+ while ((c = getopt_long(argc, argv, "ahp:svV",
+ longswaponopts, NULL)) != -1) {
+ switch (c) {
+ case 'a': /* all */
+ ++all;
+ break;
+ case 'h': /* help */
+ swapon_usage(stdout, 0);
+ break;
+ case 'p': /* priority */
+ priority = atoi(optarg);
+ break;
+ case 's': /* status report */
+ status = display_summary();
+ exit(status);
+ case 'v': /* be chatty */
+ ++verbose;
+ break;
+ case 'V': /* version */
+ printf("%s: %s\n", program_name, version);
+ exit(0);
+ case 0:
+ break;
+ case '?':
+ default:
+ swapon_usage(stderr, 1);
+ }
+ }
+ argv += optind;
+
+ if (!all && *argv == NULL)
+ swapon_usage(stderr, 2);
+
+ if (all) {
+ read_proc_swaps();
+
+ fp = setmntent(_PATH_FSTAB, "r");
+ if (fp == NULL) {
+ int errsv = errno;
+ fprintf(stderr, _("%s: cannot open %s: %s\n"),
+ program_name, _PATH_FSTAB, strerror(errsv));
+ exit(2);
+ }
+ while ((fstab = getmntent(fp)) != NULL) {
+ char *special = fstab->mnt_fsname;
+
+ if (streq(fstab->mnt_type, MNTTYPE_SWAP) &&
+ !is_in_proc_swaps(special)) {
+ /* parse mount options; */
+ char *opt, *opts = strdup(fstab->mnt_opts);
- for (opt = strtok (opts, ","); opt != NULL;
- opt = strtok (NULL, ","))
- if (strncmp(opt, "pri=", 4) == 0)
- priority = atoi(opt+4);
- status |= swap (fstab->mnt_fsname, priority);
- }
- }
- } else if (*argv == NULL) {
- usage (stderr, 2);
- } else {
- while (*argv != NULL)
- status |= swap (*argv++,priority);
- }
- return status;
+ for (opt = strtok(opts, ","); opt != NULL;
+ opt = strtok(NULL, ","))
+ if (strncmp(opt, "pri=", 4) == 0)
+ priority = atoi(opt+4);
+ status |= do_swapon(special, priority);
+ }
+ }
+ }
+
+ while (*argv != NULL)
+ status |= do_swapon(*argv++, priority);
+
+ return status;
+}
+
+static int
+main_swapoff(int argc, char *argv[]) {
+ FILE *fp;
+ struct mntent *fstab;
+ int status = 0;
+ int c, i;
+
+ while ((c = getopt_long(argc, argv, "ahvV",
+ longswapoffopts, NULL)) != -1) {
+ switch (c) {
+ case 'a': /* all */
+ ++all;
+ break;
+ case 'h': /* help */
+ swapoff_usage(stdout, 0);
+ break;
+ case 'v': /* be chatty */
+ ++verbose;
+ break;
+ case 'V': /* version */
+ printf("%s: %s\n", program_name, version);
+ exit(0);
+ case 0:
+ break;
+ case '?':
+ default:
+ swapoff_usage(stderr, 1);
+ }
+ }
+ argv += optind;
+
+ if (!all && *argv == NULL)
+ swapoff_usage(stderr, 2);
+
+ /*
+ * swapoff any explicitly given arguments.
+ * Complain in case the swapoff call fails.
+ */
+ while (*argv != NULL)
+ status |= do_swapoff(*argv++, !QUIET);
+
+ if (all) {
+ /*
+ * In case /proc/swaps exists, unmount stuff listed there.
+ * We are quiet but report errors in status.
+ * Errors might mean that /proc/swaps
+ * exists as ordinary file, not in procfs.
+ * do_swapoff() exits immediately on EPERM.
+ */
+ read_proc_swaps();
+ for(i=0; i<numSwaps; i++)
+ status |= do_swapoff(swapFiles[i], QUIET);
+
+ /*
+ * Unmount stuff mentioned in /etc/fstab.
+ * Probably it was unmounted already, so errors are not bad.
+ * Doing swapoff -a twice should not give error messages.
+ */
+ fp = setmntent(_PATH_FSTAB, "r");
+ if (fp == NULL) {
+ int errsv = errno;
+ fprintf(stderr, _("%s: cannot open %s: %s\n"),
+ program_name, _PATH_FSTAB, strerror(errsv));
+ exit(2);
+ }
+ while ((fstab = getmntent(fp)) != NULL) {
+ if (streq(fstab->mnt_type, MNTTYPE_SWAP) &&
+ !is_in_proc_swaps(fstab->mnt_fsname))
+ do_swapoff(fstab->mnt_fsname, QUIET);
+ }
+ }
+
+ return status;
+}
+
+int
+main(int argc, char *argv[]) {
+ char *p;
+
+ setlocale(LC_ALL, "");
+ bindtextdomain(PACKAGE, LOCALEDIR);
+ textdomain(PACKAGE);
+
+ program_name = argv[0];
+ p = strrchr(program_name, '/');
+ if (p)
+ program_name = p+1;
+
+ if (streq(program_name, "swapon"))
+ return main_swapon(argc, argv);
+ else
+ return main_swapoff(argc, argv);
}
diff --git a/partx/gpt.c b/partx/gpt.c
index bf90fdeb3..244320b3b 100644
--- a/partx/gpt.c
+++ b/partx/gpt.c
@@ -38,8 +38,8 @@
#include "gpt.h"
#include "partx.h"
-#define BLKGETLASTSECT _IO(0x12,108) /* get last sector of block device */
-#define BLKGETSIZE _IO(0x12,96) /* return device size */
+#define BLKGETLASTSECT _IO(0x12,108) /* get last sector of block device */
+#define BLKGETSIZE _IO(0x12,96) /* return device size */
#define BLKSSZGET _IO(0x12,104) /* get block device sector size */
#define BLKGETSIZE64 _IOR(0x12,114,sizeof(uint64_t)) /* return device size in bytes (u64 *arg) */
diff --git a/po/Makefile b/po/Makefile
index 50c266d48..648577cb3 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -3,6 +3,12 @@ PACKAGE = util-linux
include ../make_include
include ../MCONFIG
+ifeq "(DISABLE_NLS)" "yes"
+ DO_NLS=no
+else
+ DO_NLS=$(HAVE_XGETTEXT)
+endif
+
#
# po2tbl.sed is not taken from /usr/share/gettext/intl
# Often it is not present.
@@ -61,7 +67,7 @@ INSTOBJEXT = .mo
sed -f $(PO2TBL) < $< > $*.msg \
&& rm -f $@ && $(GENCAT) $@ $*.msg
-all: all-$(HAVE_XGETTEXT)
+all: all-$(DO_NLS)
all-yes: cat-id-tbl.c $(CATALOGS)
all-no:
@@ -86,7 +92,7 @@ stamp-cat-id: util-linux.pot
fi
rm -f stamp-cat-id && echo timestamp > stamp-cat-id
-install: install-data-$(HAVE_XGETTEXT)
+install: install-data-$(DO_NLS)
install-data-no: all
install-data-yes: all
@catalogs='$(CATALOGS)'; \
@@ -125,6 +131,7 @@ distclean: clean
rm -f POTFILES *.gmo *.mo *.msg *.cat *.cat.m
update-po:
+ rm -f util-linux.pot
$(MAKE) util-linux.pot
catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8d0931c85..c6ff12cfa 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,10 +1,12 @@
disk-utils/blockdev.c
disk-utils/elvtune.c
disk-utils/fdformat.c
+disk-utils/fsck.cramfs.c
disk-utils/fsck.minix.c
disk-utils/isosize.c
disk-utils/mkfs.bfs.c
disk-utils/mkfs.c
+disk-utils/mkfs.cramfs.c
disk-utils/mkfs.minix.c
disk-utils/mkswap.c
disk-utils/raw.c
@@ -25,7 +27,6 @@ hwclock/cmos.c
hwclock/hwclock.c
hwclock/kd.c
hwclock/rtc.c
-hwclock/shhopt.c
lib/carefulputc.c
lib/env.c
lib/err.c
@@ -103,5 +104,6 @@ text-utils/hexsyntax.c
text-utils/more.c
text-utils/odsyntax.c
text-utils/parse.c
+text-utils/pg.c
text-utils/rev.c
text-utils/ul.c
diff --git a/po/cat-id-tbl.c b/po/cat-id-tbl.c
index e87d3b6f6..39e5894b0 100644
--- a/po/cat-id-tbl.c
+++ b/po/cat-id-tbl.c
@@ -543,145 +543,146 @@ content won't be recoverable.\n\
{"Note: sector size is %d (not %d)\n", 452},
{"You will not be able to write the partition table.\n", 453},
{"\
+This disk has both DOS and BSD magic.\n\
+Give the 'b' command to go to BSD mode.\n", 454},
+ {"\
Device contains neither a valid DOS partition table, nor Sun, SGI or OSF \
-disklabel\n", 454},
- {"Internal error\n", 455},
- {"Ignoring extra extended partition %d\n", 456},
+disklabel\n", 455},
+ {"Internal error\n", 456},
+ {"Ignoring extra extended partition %d\n", 457},
{"\
Warning: invalid flag 0x%04x of partition table %d will be corrected by w\
-(rite)\n", 457},
+(rite)\n", 458},
{"\
\n\
-got EOF thrice - exiting..\n", 458},
- {"Hex code (type L to list codes): ", 459},
- {"%s (%d-%d, default %d): ", 460},
- {"Using default value %d\n", 461},
- {"Value out of range.\n", 462},
- {"Partition number", 463},
- {"Warning: partition %d has empty type\n", 464},
- {"cylinder", 465},
- {"sector", 466},
- {"Changing display/entry units to %s\n", 467},
- {"WARNING: Partition %d is an extended partition\n", 468},
- {"DOS Compatibility flag is set\n", 469},
- {"DOS Compatibility flag is not set\n", 470},
- {"Partition %d does not exist yet!\n", 471},
+got EOF thrice - exiting..\n", 459},
+ {"Hex code (type L to list codes): ", 460},
+ {"%s (%d-%d, default %d): ", 461},
+ {"Using default value %d\n", 462},
+ {"Value out of range.\n", 463},
+ {"Partition number", 464},
+ {"Warning: partition %d has empty type\n", 465},
+ {"cylinder", 466},
+ {"sector", 467},
+ {"Changing display/entry units to %s\n", 468},
+ {"WARNING: Partition %d is an extended partition\n", 469},
+ {"DOS Compatibility flag is set\n", 470},
+ {"DOS Compatibility flag is not set\n", 471},
+ {"Partition %d does not exist yet!\n", 472},
{"\
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", 472},
+a partition using the `d' command.\n", 473},
{"\
You cannot change a partition into an extended one or vice versa\n\
-Delete it first.\n", 473},
+Delete it first.\n", 474},
{"\
Consider leaving partition 3 as Whole disk (5),\n\
as SunOS/Solaris expects it and even Linux likes it.\n\
-\n", 474},
+\n", 475},
{"\
Consider leaving partition 9 as volume header (0),\n\
and partition 11 as entire volume (6)as IRIX expects it.\n\
-\n", 475},
- {"Changed system type of partition %d to %x (%s)\n", 476},
- {"Partition %d has different physical/logical beginnings (non-Linux?):\n", 477},
- {" phys=(%d, %d, %d) ", 478},
- {"logical=(%d, %d, %d)\n", 479},
- {"Partition %d has different physical/logical endings:\n", 480},
- {"Partition %i does not start on cylinder boundary:\n", 481},
- {"should be (%d, %d, 1)\n", 482},
- {"Partition %i does not end on cylinder boundary:\n", 483},
- {"should be (%d, %d, %d)\n", 484},
+\n", 476},
+ {"Changed system type of partition %d to %x (%s)\n", 477},
+ {"Partition %d has different physical/logical beginnings (non-Linux?):\n", 478},
+ {" phys=(%d, %d, %d) ", 479},
+ {"logical=(%d, %d, %d)\n", 480},
+ {"Partition %d has different physical/logical endings:\n", 481},
+ {"Partition %i does not start on cylinder boundary:\n", 482},
+ {"should be (%d, %d, 1)\n", 483},
+ {"Partition %i does not end on cylinder boundary:\n", 484},
+ {"should be (%d, %d, %d)\n", 485},
{"\
\n\
Disk %s: %d heads, %d sectors, %d cylinders\n\
Units = %s of %d * %d bytes\n\
-\n", 485},
+\n", 486},
{"\
Nothing to do. Ordering is correct already.\n\
-\n", 486},
- {"%*s Boot Start End Blocks Id System\n", 487},
- {"Device", 488},
+\n", 487},
+ {"%*s Boot Start End Blocks Id System\n", 488},
+ {"Device", 489},
{"\
\n\
-Partition table entries are not in disk order\n", 489},
+Partition table entries are not in disk order\n", 490},
{"\
\n\
Disk %s: %d heads, %d sectors, %d cylinders\n\
-\n", 490},
- {"Nr AF Hd Sec Cyl Hd Sec Cyl Start Size ID\n", 491},
- {"Warning: partition %d contains sector 0\n", 492},
- {"Partition %d: head %d greater than maximum %d\n", 493},
- {"Partition %d: sector %d greater than maximum %d\n", 494},
- {"Partitions %d: cylinder %d greater than maximum %d\n", 495},
- {"Partition %d: previous sectors %d disagrees with total %d\n", 496},
- {"Warning: bad start-of-data in partition %d\n", 497},
- {"Warning: partition %d overlaps partition %d.\n", 498},
- {"Warning: partition %d is empty\n", 499},
- {"Logical partition %d not entirely in partition %d\n", 500},
- {"Total allocated sectors %d greater than the maximum %d\n", 501},
- {"%d unallocated sectors\n", 502},
- {"Partition %d is already defined. Delete it before re-adding it.\n", 503},
- {"First %s", 504},
- {"Sector %d is already allocated\n", 505},
- {"No free sectors available\n", 506},
- {"Last %s or +size or +sizeM or +sizeK", 507},
+\n", 491},
+ {"Nr AF Hd Sec Cyl Hd Sec Cyl Start Size ID\n", 492},
+ {"Warning: partition %d contains sector 0\n", 493},
+ {"Partition %d: head %d greater than maximum %d\n", 494},
+ {"Partition %d: sector %d greater than maximum %d\n", 495},
+ {"Partitions %d: cylinder %d greater than maximum %d\n", 496},
+ {"Partition %d: previous sectors %d disagrees with total %d\n", 497},
+ {"Warning: bad start-of-data in partition %d\n", 498},
+ {"Warning: partition %d overlaps partition %d.\n", 499},
+ {"Warning: partition %d is empty\n", 500},
+ {"Logical partition %d not entirely in partition %d\n", 501},
+ {"Total allocated sectors %d greater than the maximum %d\n", 502},
+ {"%d unallocated sectors\n", 503},
+ {"Partition %d is already defined. Delete it before re-adding it.\n", 504},
+ {"First %s", 505},
+ {"Sector %d is already allocated\n", 506},
+ {"No free sectors available\n", 507},
+ {"Last %s or +size or +sizeM or +sizeK", 508},
{"\
\tSorry - this fdisk cannot handle AIX disk labels.\n\
\tIf you want to add DOS-type partitions, create\n\
\ta new empty DOS partition table first. (Use o.)\n\
-\tWARNING: This will destroy the present disk contents.\n", 508},
- {"The maximum number of partitions has been created\n", 509},
- {"You must delete some partition and add an extended partition first\n", 510},
+\tWARNING: This will destroy the present disk contents.\n", 509},
+ {"The maximum number of partitions has been created\n", 510},
+ {"You must delete some partition and add an extended partition first\n", 511},
{"\
Command action\n\
%s\n\
- p primary partition (1-4)\n", 511},
- {"l logical (5 or over)", 512},
- {"e extended", 513},
- {"Invalid partition number for type `%c'\n", 514},
+ p primary partition (1-4)\n", 512},
+ {"l logical (5 or over)", 513},
+ {"e extended", 514},
+ {"Invalid partition number for type `%c'\n", 515},
{"\
The partition table has been altered!\n\
-\n", 515},
- {"Calling ioctl() to re-read partition table.\n", 516},
+\n", 516},
+ {"Calling ioctl() to re-read partition table.\n", 517},
{"\
\n\
WARNING: Re-reading the partition table failed with error %d: %s.\n\
The kernel still uses the old table.\n\
-The new table will be used at the next reboot.\n", 517},
+The new table will be used at the next reboot.\n", 518},
{"\
\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", 518},
- {"Syncing disks.\n", 519},
- {"Partition %d has no data area\n", 520},
- {"New beginning of data", 521},
- {"Expert command (m for help): ", 522},
- {"Number of cylinders", 523},
- {"Number of heads", 524},
- {"Number of sectors", 525},
- {"Warning: setting sector offset for DOS compatiblity\n", 526},
- {"Disk %s doesn't contain a valid partition table\n", 527},
- {"Cannot open %s\n", 528},
- {"cannot open %s\n", 529},
- {"%c: unknown command\n", 530},
- {"This kernel finds the sector size itself - -b option ignored\n", 531},
+information.\n", 519},
+ {"Syncing disks.\n", 520},
+ {"Partition %d has no data area\n", 521},
+ {"New beginning of data", 522},
+ {"Expert command (m for help): ", 523},
+ {"Number of cylinders", 524},
+ {"Number of heads", 525},
+ {"Number of sectors", 526},
+ {"Warning: setting sector offset for DOS compatiblity\n", 527},
+ {"Disk %s doesn't contain a valid partition table\n", 528},
+ {"Cannot open %s\n", 529},
+ {"cannot open %s\n", 530},
+ {"%c: unknown command\n", 531},
+ {"This kernel finds the sector size itself - -b option ignored\n", 532},
{"\
Warning: the -b (set sector size) option should be used with one specified \
-device\n", 532},
- {"\
-Detected an OSF/1 disklabel on %s, entering disklabel mode.\n\
-To return to DOS partition table mode, use the 'r' command.\n", 533},
- {"Command (m for help): ", 534},
+device\n", 533},
+ {"Detected an OSF/1 disklabel on %s, entering disklabel mode.\n", 534},
+ {"Command (m for help): ", 535},
{"\
\n\
-The current boot file is: %s\n", 535},
- {"Please enter the name of the new boot file: ", 536},
- {"Boot file unchanged\n", 537},
+The current boot file is: %s\n", 536},
+ {"Please enter the name of the new boot file: ", 537},
+ {"Boot file unchanged\n", 538},
{"\
\n\
\tSorry, no experts menu for SGI partition tables available.\n\
-\n", 538},
+\n", 539},
{"\
\n\
\tThere is a valid AIX label on this disk.\n\
@@ -694,94 +695,94 @@ The current boot file is: %s\n", 535},
\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).", 539},
+\t machine. (Otherwise you become an AIXpert).", 540},
{"\
\n\
-BSD label for device: %s\n", 540},
- {" d delete a BSD partition", 541},
- {" e edit drive data", 542},
- {" i install bootstrap", 543},
- {" l list known filesystem types", 544},
- {" n add a new BSD partition", 545},
- {" p print BSD partition table", 546},
- {" s show complete disklabel", 547},
- {" t change a partition's filesystem id", 548},
- {" u change units (cylinders/sectors)", 549},
- {" w write disklabel to disk", 550},
- {" x link BSD partition to non-BSD partition", 551},
- {"Partition %s has invalid starting sector 0.\n", 552},
- {"Reading disklabel of %s at sector %d.\n", 553},
- {"There is no *BSD partition on %s.\n", 554},
- {"BSD disklabel command (m for help): ", 555},
- {"type: %s\n", 556},
- {"type: %d\n", 557},
- {"disk: %.*s\n", 558},
- {"label: %.*s\n", 559},
- {"flags:", 560},
- {" removable", 561},
- {" ecc", 562},
- {" badsect", 563},
- {"bytes/sector: %ld\n", 564},
- {"sectors/track: %ld\n", 565},
- {"tracks/cylinder: %ld\n", 566},
- {"sectors/cylinder: %ld\n", 567},
- {"cylinders: %ld\n", 568},
- {"rpm: %d\n", 569},
- {"interleave: %d\n", 570},
- {"trackskew: %d\n", 571},
- {"cylinderskew: %d\n", 572},
- {"headswitch: %ld\t\t# milliseconds\n", 573},
- {"track-to-track seek: %ld\t# milliseconds\n", 574},
- {"drivedata: ", 575},
+BSD label for device: %s\n", 541},
+ {" d delete a BSD partition", 542},
+ {" e edit drive data", 543},
+ {" i install bootstrap", 544},
+ {" l list known filesystem types", 545},
+ {" n add a new BSD partition", 546},
+ {" p print BSD partition table", 547},
+ {" s show complete disklabel", 548},
+ {" t change a partition's filesystem id", 549},
+ {" u change units (cylinders/sectors)", 550},
+ {" w write disklabel to disk", 551},
+ {" x link BSD partition to non-BSD partition", 552},
+ {"Partition %s has invalid starting sector 0.\n", 553},
+ {"Reading disklabel of %s at sector %d.\n", 554},
+ {"There is no *BSD partition on %s.\n", 555},
+ {"BSD disklabel command (m for help): ", 556},
+ {"type: %s\n", 557},
+ {"type: %d\n", 558},
+ {"disk: %.*s\n", 559},
+ {"label: %.*s\n", 560},
+ {"flags:", 561},
+ {" removable", 562},
+ {" ecc", 563},
+ {" badsect", 564},
+ {"bytes/sector: %ld\n", 565},
+ {"sectors/track: %ld\n", 566},
+ {"tracks/cylinder: %ld\n", 567},
+ {"sectors/cylinder: %ld\n", 568},
+ {"cylinders: %ld\n", 569},
+ {"rpm: %d\n", 570},
+ {"interleave: %d\n", 571},
+ {"trackskew: %d\n", 572},
+ {"cylinderskew: %d\n", 573},
+ {"headswitch: %ld\t\t# milliseconds\n", 574},
+ {"track-to-track seek: %ld\t# milliseconds\n", 575},
+ {"drivedata: ", 576},
{"\
\n\
-%d partitions:\n", 576},
- {"# start end size fstype [fsize bsize cpg]\n", 577},
- {"Writing disklabel to %s.\n", 578},
- {"%s contains no disklabel.\n", 579},
- {"Do you want to create a disklabel? (y/n) ", 580},
- {"bytes/sector", 581},
- {"sectors/track", 582},
- {"tracks/cylinder", 583},
- {"sectors/cylinder", 584},
- {"Must be <= sectors/track * tracks/cylinder (default).\n", 585},
- {"rpm", 586},
- {"interleave", 587},
- {"trackskew", 588},
- {"cylinderskew", 589},
- {"headswitch", 590},
- {"track-to-track seek", 591},
- {"Bootstrap: %sboot -> boot%s (%s): ", 592},
- {"Bootstrap overlaps with disk label!\n", 593},
- {"Bootstrap installed on %s.\n", 594},
- {"Partition (a-%c): ", 595},
- {"This partition already exists.\n", 596},
- {"Warning: too many partitions (%d, maximum is %d).\n", 597},
+%d partitions:\n", 577},
+ {"# start end size fstype [fsize bsize cpg]\n", 578},
+ {"Writing disklabel to %s.\n", 579},
+ {"%s contains no disklabel.\n", 580},
+ {"Do you want to create a disklabel? (y/n) ", 581},
+ {"bytes/sector", 582},
+ {"sectors/track", 583},
+ {"tracks/cylinder", 584},
+ {"sectors/cylinder", 585},
+ {"Must be <= sectors/track * tracks/cylinder (default).\n", 586},
+ {"rpm", 587},
+ {"interleave", 588},
+ {"trackskew", 589},
+ {"cylinderskew", 590},
+ {"headswitch", 591},
+ {"track-to-track seek", 592},
+ {"Bootstrap: %sboot -> boot%s (%s): ", 593},
+ {"Bootstrap overlaps with disk label!\n", 594},
+ {"Bootstrap installed on %s.\n", 595},
+ {"Partition (a-%c): ", 596},
+ {"This partition already exists.\n", 597},
+ {"Warning: too many partitions (%d, maximum is %d).\n", 598},
{"\
\n\
-Syncing disks.\n", 598},
- {"SGI volhdr", 599},
- {"SGI trkrepl", 600},
- {"SGI secrepl", 601},
- {"SGI raw", 602},
- {"SGI bsd", 603},
- {"SGI sysv", 604},
- {"SGI volume", 605},
- {"SGI efs", 606},
- {"SGI lvol", 607},
- {"SGI rlvol", 608},
- {"SGI xfs", 609},
- {"SGI xfslog", 610},
- {"SGI xlv", 611},
- {"SGI xvm", 612},
- {"Linux swap", 613},
- {"Linux native", 614},
- {"Linux LVM", 615},
- {"Linux RAID", 616},
+Syncing disks.\n", 599},
+ {"SGI volhdr", 600},
+ {"SGI trkrepl", 601},
+ {"SGI secrepl", 602},
+ {"SGI raw", 603},
+ {"SGI bsd", 604},
+ {"SGI sysv", 605},
+ {"SGI volume", 606},
+ {"SGI efs", 607},
+ {"SGI lvol", 608},
+ {"SGI rlvol", 609},
+ {"SGI xfs", 610},
+ {"SGI xfslog", 611},
+ {"SGI xlv", 612},
+ {"SGI xvm", 613},
+ {"Linux swap", 614},
+ {"Linux native", 615},
+ {"Linux LVM", 616},
+ {"Linux RAID", 617},
{"\
According to MIPS Computer Systems, Inc the Label must not contain more than \
-512 bytes\n", 617},
- {"Detected sgi disklabel with wrong checksum.\n", 618},
+512 bytes\n", 618},
+ {"Detected sgi disklabel with wrong checksum.\n", 619},
{"\
\n\
Disk %s (SGI disk label): %d heads, %d sectors\n\
@@ -789,141 +790,141 @@ 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", 619},
+\n", 620},
{"\
\n\
Disk %s (SGI disk label): %d heads, %d sectors, %d cylinders\n\
Units = %s of %d * 512 bytes\n\
-\n", 620},
+\n", 621},
{"\
----- partitions -----\n\
-Pt# %*s Info Start End Sectors Id System\n", 621},
+Pt# %*s Info Start End Sectors Id System\n", 622},
{"\
----- Bootinfo -----\n\
Bootfile: %s\n\
------ Directory Entries -----\n", 622},
- {"%2d: %-10s sector%5u size%8u\n", 623},
+----- Directory Entries -----\n", 623},
+ {"%2d: %-10s sector%5u size%8u\n", 624},
{"\
\n\
Invalid Bootfile!\n\
\tThe bootfile must be an absolute non-zero pathname,\n\
-\te.g. \"/unix\" or \"/unix.save\".\n", 624},
+\te.g. \"/unix\" or \"/unix.save\".\n", 625},
{"\
\n\
-\tName of Bootfile too long: 16 bytes maximum.\n", 625},
+\tName of Bootfile too long: 16 bytes maximum.\n", 626},
{"\
\n\
-\tBootfile must have a fully qualified pathname.\n", 626},
+\tBootfile must have a fully qualified pathname.\n", 627},
{"\
\n\
\tBe aware, that the bootfile is not checked for existence.\n\
-\tSGI's default is \"/unix\" and for backup \"/unix.save\".\n", 627},
+\tSGI's default is \"/unix\" and for backup \"/unix.save\".\n", 628},
{"\
\n\
-\tBootfile is changed to \"%s\".\n", 628},
- {"More than one entire disk entry present.\n", 629},
- {"No partitions defined\n", 630},
- {"IRIX likes when Partition 11 covers the entire disk.\n", 631},
+\tBootfile is changed to \"%s\".\n", 629},
+ {"More than one entire disk entry present.\n", 630},
+ {"No partitions defined\n", 631},
+ {"IRIX likes when Partition 11 covers the entire disk.\n", 632},
{"\
The entire disk partition should start at block 0,\n\
-not at diskblock %d.\n", 632},
+not at diskblock %d.\n", 633},
{"\
The entire disk partition is only %d diskblock large,\n\
-but the disk is %d diskblocks long.\n", 633},
- {"One Partition (#11) should cover the entire disk.\n", 634},
- {"Partition %d does not start on cylinder boundary.\n", 635},
- {"Partition %d does not end on cylinder boundary.\n", 636},
- {"The Partition %d and %d overlap by %d sectors.\n", 637},
- {"Unused gap of %8d sectors - sectors %8d-%d\n", 638},
+but the disk is %d diskblocks long.\n", 634},
+ {"One Partition (#11) should cover the entire disk.\n", 635},
+ {"Partition %d does not start on cylinder boundary.\n", 636},
+ {"Partition %d does not end on cylinder boundary.\n", 637},
+ {"The Partition %d and %d overlap by %d sectors.\n", 638},
+ {"Unused gap of %8d sectors - sectors %8d-%d\n", 639},
{"\
\n\
-The boot partition does not exist.\n", 639},
+The boot partition does not exist.\n", 640},
{"\
\n\
-The swap partition does not exist.\n", 640},
+The swap partition does not exist.\n", 641},
{"\
\n\
-The swap partition has no swap type.\n", 641},
- {"\tYou have chosen an unusual boot file name.\n", 642},
- {"Sorry You may change the Tag of non-empty partitions.\n", 643},
+The swap partition has no swap type.\n", 642},
+ {"\tYou have chosen an unusual boot file name.\n", 643},
+ {"Sorry You may change the Tag of non-empty partitions.\n", 644},
{"\
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", 644},
- {"YES\n", 645},
- {"Do You know, You got a partition overlap on the disk?\n", 646},
- {"Attempting to generate entire disk entry automatically.\n", 647},
- {"The entire disk is already covered with partitions.\n", 648},
- {"You got a partition overlap on the disk. Fix it first!\n", 649},
+Type YES if you are sure about tagging this partition differently.\n", 645},
+ {"YES\n", 646},
+ {"Do You know, You got a partition overlap on the disk?\n", 647},
+ {"Attempting to generate entire disk entry automatically.\n", 648},
+ {"The entire disk is already covered with partitions.\n", 649},
+ {"You got a partition overlap on the disk. Fix it first!\n", 650},
{"\
It is highly recommended that eleventh partition\n\
-covers the entire disk and is of type `SGI volume'\n", 650},
- {"You will get a partition overlap on the disk. Fix it first!\n", 651},
- {" Last %s", 652},
+covers the entire disk and is of type `SGI volume'\n", 651},
+ {"You will get a partition overlap on the disk. Fix it first!\n", 652},
+ {" Last %s", 653},
{"\
Building a new SGI disklabel. Changes will remain in memory only,\n\
until you decide to write them. After that, of course, the previous\n\
content will be unrecoverably lost.\n\
-\n", 653},
- {"Trying to keep parameters of partition %d.\n", 654},
- {"ID=%02x\tSTART=%d\tLENGTH=%d\n", 655},
- {"Empty", 656},
- {"SunOS root", 657},
- {"SunOS swap", 658},
- {"SunOS usr", 659},
- {"Whole disk", 660},
- {"SunOS stand", 661},
- {"SunOS var", 662},
- {"SunOS home", 663},
- {"Linux raid autodetect", 664},
+\n", 654},
+ {"Trying to keep parameters of partition %d.\n", 655},
+ {"ID=%02x\tSTART=%d\tLENGTH=%d\n", 656},
+ {"Empty", 657},
+ {"SunOS root", 658},
+ {"SunOS swap", 659},
+ {"SunOS usr", 660},
+ {"Whole disk", 661},
+ {"SunOS stand", 662},
+ {"SunOS var", 663},
+ {"SunOS home", 664},
+ {"Linux raid autodetect", 665},
{"\
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", 665},
- {"Autoconfigure found a %s%s%s\n", 666},
+or force a fresh label (s command in main menu)\n", 666},
+ {"Autoconfigure found a %s%s%s\n", 667},
{"\
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", 667},
+\n", 668},
{"\
Drive type\n\
? auto configure\n\
- 0 custom (with hardware detected defaults)", 668},
- {"Select type (? for auto, 0 for custom): ", 669},
- {"Autoconfigure failed.\n", 670},
- {"Sectors/track", 671},
- {"Alternate cylinders", 672},
- {"Physical cylinders", 673},
- {"Rotation speed (rpm)", 674},
- {"Interleave factor", 675},
- {"Extra sectors per cylinder", 676},
- {"You may change all the disk params from the x menu", 677},
- {"3,5\" floppy", 678},
- {"Linux custom", 679},
- {"Partition %d doesn't end on cylinder boundary\n", 680},
- {"Partition %d overlaps with others in sectors %d-%d\n", 681},
- {"Unused gap - sectors 0-%d\n", 682},
- {"Unused gap - sectors %d-%d\n", 683},
+ 0 custom (with hardware detected defaults)", 669},
+ {"Select type (? for auto, 0 for custom): ", 670},
+ {"Autoconfigure failed.\n", 671},
+ {"Sectors/track", 672},
+ {"Alternate cylinders", 673},
+ {"Physical cylinders", 674},
+ {"Rotation speed (rpm)", 675},
+ {"Interleave factor", 676},
+ {"Extra sectors per cylinder", 677},
+ {"You may change all the disk params from the x menu", 678},
+ {"3,5\" floppy", 679},
+ {"Linux custom", 680},
+ {"Partition %d doesn't end on cylinder boundary\n", 681},
+ {"Partition %d overlaps with others in sectors %d-%d\n", 682},
+ {"Unused gap - sectors 0-%d\n", 683},
+ {"Unused gap - sectors %d-%d\n", 684},
{"\
Other partitions already cover the whole disk.\n\
-Delete some/shrink them before retry.\n", 684},
+Delete some/shrink them before retry.\n", 685},
{"\
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", 685},
+to %d %s\n", 686},
{"\
If you want to maintain SunOS/Solaris compatibility, consider leaving this\n\
-partition as Whole disk (5), starting at 0, with %u sectors\n", 686},
+partition as Whole disk (5), starting at 0, with %u sectors\n", 687},
{"\
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): ", 687},
+tagged with 82 (Linux swap): ", 688},
{"\
\n\
Disk %s (Sun disk label): %d heads, %d sectors, %d rpm\n\
@@ -931,456 +932,456 @@ 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", 688},
+\n", 689},
{"\
\n\
Disk %s (Sun disk label): %d heads, %d sectors, %d cylinders\n\
Units = %s of %d * 512 bytes\n\
-\n", 689},
- {"%*s Flag Start End Blocks Id System\n", 690},
- {"Number of alternate cylinders", 691},
- {"Number of physical cylinders", 692},
- {"FAT12", 693},
- {"XENIX root", 694},
- {"XENIX usr", 695},
- {"FAT16 <32M", 696},
- {"Extended", 697},
- {"FAT16", 698},
- {"HPFS/NTFS", 699},
- {"AIX", 700},
- {"AIX bootable", 701},
- {"OS/2 Boot Manager", 702},
- {"Win95 FAT32", 703},
- {"Win95 FAT32 (LBA)", 704},
- {"Win95 FAT16 (LBA)", 705},
- {"Win95 Ext'd (LBA)", 706},
- {"OPUS", 707},
- {"Hidden FAT12", 708},
- {"Compaq diagnostics", 709},
- {"Hidden FAT16 <32M", 710},
- {"Hidden FAT16", 711},
- {"Hidden HPFS/NTFS", 712},
- {"AST SmartSleep", 713},
- {"Hidden Win95 FAT32", 714},
- {"Hidden Win95 FAT32 (LBA)", 715},
- {"Hidden Win95 FAT16 (LBA)", 716},
- {"NEC DOS", 717},
- {"Plan 9", 718},
- {"PartitionMagic recovery", 719},
- {"Venix 80286", 720},
- {"PPC PReP Boot", 721},
- {"SFS", 722},
- {"QNX4.x", 723},
- {"QNX4.x 2nd part", 724},
- {"QNX4.x 3rd part", 725},
- {"OnTrack DM", 726},
- {"OnTrack DM6 Aux1", 727},
- {"CP/M", 728},
- {"OnTrack DM6 Aux3", 729},
- {"OnTrackDM6", 730},
- {"EZ-Drive", 731},
- {"Golden Bow", 732},
- {"Priam Edisk", 733},
- {"SpeedStor", 734},
- {"GNU HURD or SysV", 735},
- {"Novell Netware 286", 736},
- {"Novell Netware 386", 737},
- {"DiskSecure Multi-Boot", 738},
- {"PC/IX", 739},
- {"Old Minix", 740},
- {"Minix / old Linux", 741},
- {"OS/2 hidden C: drive", 742},
- {"Linux extended", 743},
- {"NTFS volume set", 744},
- {"Amoeba", 745},
- {"Amoeba BBT", 746},
- {"BSD/OS", 747},
- {"IBM Thinkpad hibernation", 748},
- {"FreeBSD", 749},
- {"OpenBSD", 750},
- {"NeXTSTEP", 751},
- {"Darwin UFS", 752},
- {"NetBSD", 753},
- {"Darwin boot", 754},
- {"BSDI fs", 755},
- {"BSDI swap", 756},
- {"Boot Wizard hidden", 757},
- {"Solaris boot", 758},
- {"DRDOS/sec (FAT-12)", 759},
- {"DRDOS/sec (FAT-16 < 32M)", 760},
- {"DRDOS/sec (FAT-16)", 761},
- {"Syrinx", 762},
- {"Non-FS data", 763},
- {"CP/M / CTOS / ...", 764},
- {"Dell Utility", 765},
- {"BootIt", 766},
- {"DOS access", 767},
- {"DOS R/O", 768},
- {"BeOS fs", 769},
- {"EFI GPT", 770},
- {"EFI (FAT-12/16/32)", 771},
- {"Linux/PA-RISC boot", 772},
- {"DOS secondary", 773},
- {"LANstep", 774},
- {"BBT", 775},
- {"seek error on %s - cannot seek to %lu\n", 776},
- {"seek error: wanted 0x%08x%08x, got 0x%08x%08x\n", 777},
- {"out of memory - giving up\n", 778},
- {"read error on %s - cannot read sector %lu\n", 779},
- {"ERROR: sector %lu does not have an msdos signature\n", 780},
- {"write error on %s - cannot write sector %lu\n", 781},
- {"cannot open partition sector save file (%s)\n", 782},
- {"write error on %s\n", 783},
- {"cannot stat partition restore file (%s)\n", 784},
- {"partition restore file has wrong size - not restoring\n", 785},
- {"out of memory?\n", 786},
- {"cannot open partition restore file (%s)\n", 787},
- {"error reading %s\n", 788},
- {"cannot open device %s for writing\n", 789},
- {"error writing sector %lu on %s\n", 790},
- {"Disk %s: cannot get size\n", 791},
- {"Disk %s: cannot get geometry\n", 792},
+\n", 690},
+ {"%*s Flag Start End Blocks Id System\n", 691},
+ {"Number of alternate cylinders", 692},
+ {"Number of physical cylinders", 693},
+ {"FAT12", 694},
+ {"XENIX root", 695},
+ {"XENIX usr", 696},
+ {"FAT16 <32M", 697},
+ {"Extended", 698},
+ {"FAT16", 699},
+ {"HPFS/NTFS", 700},
+ {"AIX", 701},
+ {"AIX bootable", 702},
+ {"OS/2 Boot Manager", 703},
+ {"Win95 FAT32", 704},
+ {"Win95 FAT32 (LBA)", 705},
+ {"Win95 FAT16 (LBA)", 706},
+ {"Win95 Ext'd (LBA)", 707},
+ {"OPUS", 708},
+ {"Hidden FAT12", 709},
+ {"Compaq diagnostics", 710},
+ {"Hidden FAT16 <32M", 711},
+ {"Hidden FAT16", 712},
+ {"Hidden HPFS/NTFS", 713},
+ {"AST SmartSleep", 714},
+ {"Hidden Win95 FAT32", 715},
+ {"Hidden Win95 FAT32 (LBA)", 716},
+ {"Hidden Win95 FAT16 (LBA)", 717},
+ {"NEC DOS", 718},
+ {"Plan 9", 719},
+ {"PartitionMagic recovery", 720},
+ {"Venix 80286", 721},
+ {"PPC PReP Boot", 722},
+ {"SFS", 723},
+ {"QNX4.x", 724},
+ {"QNX4.x 2nd part", 725},
+ {"QNX4.x 3rd part", 726},
+ {"OnTrack DM", 727},
+ {"OnTrack DM6 Aux1", 728},
+ {"CP/M", 729},
+ {"OnTrack DM6 Aux3", 730},
+ {"OnTrackDM6", 731},
+ {"EZ-Drive", 732},
+ {"Golden Bow", 733},
+ {"Priam Edisk", 734},
+ {"SpeedStor", 735},
+ {"GNU HURD or SysV", 736},
+ {"Novell Netware 286", 737},
+ {"Novell Netware 386", 738},
+ {"DiskSecure Multi-Boot", 739},
+ {"PC/IX", 740},
+ {"Old Minix", 741},
+ {"Minix / old Linux", 742},
+ {"OS/2 hidden C: drive", 743},
+ {"Linux extended", 744},
+ {"NTFS volume set", 745},
+ {"Amoeba", 746},
+ {"Amoeba BBT", 747},
+ {"BSD/OS", 748},
+ {"IBM Thinkpad hibernation", 749},
+ {"FreeBSD", 750},
+ {"OpenBSD", 751},
+ {"NeXTSTEP", 752},
+ {"Darwin UFS", 753},
+ {"NetBSD", 754},
+ {"Darwin boot", 755},
+ {"BSDI fs", 756},
+ {"BSDI swap", 757},
+ {"Boot Wizard hidden", 758},
+ {"Solaris boot", 759},
+ {"DRDOS/sec (FAT-12)", 760},
+ {"DRDOS/sec (FAT-16 < 32M)", 761},
+ {"DRDOS/sec (FAT-16)", 762},
+ {"Syrinx", 763},
+ {"Non-FS data", 764},
+ {"CP/M / CTOS / ...", 765},
+ {"Dell Utility", 766},
+ {"BootIt", 767},
+ {"DOS access", 768},
+ {"DOS R/O", 769},
+ {"BeOS fs", 770},
+ {"EFI GPT", 771},
+ {"EFI (FAT-12/16/32)", 772},
+ {"Linux/PA-RISC boot", 773},
+ {"DOS secondary", 774},
+ {"LANstep", 775},
+ {"BBT", 776},
+ {"seek error on %s - cannot seek to %lu\n", 777},
+ {"seek error: wanted 0x%08x%08x, got 0x%08x%08x\n", 778},
+ {"out of memory - giving up\n", 779},
+ {"read error on %s - cannot read sector %lu\n", 780},
+ {"ERROR: sector %lu does not have an msdos signature\n", 781},
+ {"write error on %s - cannot write sector %lu\n", 782},
+ {"cannot open partition sector save file (%s)\n", 783},
+ {"write error on %s\n", 784},
+ {"cannot stat partition restore file (%s)\n", 785},
+ {"partition restore file has wrong size - not restoring\n", 786},
+ {"out of memory?\n", 787},
+ {"cannot open partition restore file (%s)\n", 788},
+ {"error reading %s\n", 789},
+ {"cannot open device %s for writing\n", 790},
+ {"error writing sector %lu on %s\n", 791},
+ {"Disk %s: cannot get size\n", 792},
+ {"Disk %s: cannot get geometry\n", 793},
{"\
Warning: start=%lu - this looks like a partition rather than\n\
the entire disk. Using fdisk on it is probably meaningless.\n\
-[Use the --force option if you really want this]\n", 793},
- {"Warning: HDIO_GETGEO says that there are %lu heads\n", 794},
- {"Warning: HDIO_GETGEO says that there are %lu sectors\n", 795},
- {"Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n", 796},
+[Use the --force option if you really want this]\n", 794},
+ {"Warning: HDIO_GETGEO says that there are %lu heads\n", 795},
+ {"Warning: HDIO_GETGEO says that there are %lu sectors\n", 796},
+ {"Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n", 797},
{"\
Warning: unlikely number of sectors (%lu) - usually at most 63\n\
-This will give problems with all software that uses C/H/S addressing.\n", 797},
+This will give problems with all software that uses C/H/S addressing.\n", 798},
{"\
\n\
-Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n", 798},
+Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n", 799},
{"\
-%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n", 799},
+%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n", 800},
{"\
%s of partition %s has impossible value for sector: %lu (should be in 1-%\
-lu)\n", 800},
+lu)\n", 801},
{"\
%s of partition %s has impossible value for cylinders: %lu (should be in 0-%\
-lu)\n", 801},
+lu)\n", 802},
{"\
Id Name\n\
-\n", 802},
- {"Re-reading the partition table ...\n", 803},
+\n", 803},
+ {"Re-reading the partition table ...\n", 804},
{"\
The command to re-read the partition table failed\n\
-Reboot your system now, before using mkfs\n", 804},
- {"Error closing %s\n", 805},
- {"%s: no such partition\n", 806},
- {"unrecognized format - using sectors\n", 807},
- {"# partition table of %s\n", 808},
- {"unimplemented format - using %s\n", 809},
+Reboot your system now, before using mkfs\n", 805},
+ {"Error closing %s\n", 806},
+ {"%s: no such partition\n", 807},
+ {"unrecognized format - using sectors\n", 808},
+ {"# partition table of %s\n", 809},
+ {"unimplemented format - using %s\n", 810},
{"\
Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n\
-\n", 810},
- {" Device Boot Start End #cyls #blocks Id System\n", 811},
+\n", 811},
+ {" Device Boot Start End #cyls #blocks Id System\n", 812},
{"\
Units = sectors of 512 bytes, counting from %d\n\
-\n", 812},
- {" Device Boot Start End #sectors Id System\n", 813},
+\n", 813},
+ {" Device Boot Start End #sectors Id System\n", 814},
{"\
Units = blocks of 1024 bytes, counting from %d\n\
-\n", 814},
- {" Device Boot Start End #blocks Id System\n", 815},
+\n", 815},
+ {" Device Boot Start End #blocks Id System\n", 816},
{"\
Units = megabytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n\
-\n", 816},
- {" Device Boot Start End MB #blocks Id System\n", 817},
- {"\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 818},
- {"\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 819},
- {"partition ends on cylinder %ld, beyond the end of the disk\n", 820},
- {"No partitions found\n", 821},
+\n", 817},
+ {" Device Boot Start End MB #blocks Id System\n", 818},
+ {"\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 819},
+ {"\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 820},
+ {"partition ends on cylinder %ld, beyond the end of the disk\n", 821},
+ {"No partitions found\n", 822},
{"\
Warning: The partition table looks like it was made\n\
for C/H/S=*/%ld/%ld (instead of %ld/%ld/%ld).\n\
-For this listing I'll assume that geometry.\n", 822},
- {"no partition table present.\n", 823},
- {"strange, only %d partitions defined.\n", 824},
- {"Warning: partition %s has size 0 but is not marked Empty\n", 825},
- {"Warning: partition %s has size 0 and is bootable\n", 826},
- {"Warning: partition %s has size 0 and nonzero start\n", 827},
- {"Warning: partition %s ", 828},
- {"is not contained in partition %s\n", 829},
- {"Warning: partitions %s ", 830},
- {"and %s overlap\n", 831},
+For this listing I'll assume that geometry.\n", 823},
+ {"no partition table present.\n", 824},
+ {"strange, only %d partitions defined.\n", 825},
+ {"Warning: partition %s has size 0 but is not marked Empty\n", 826},
+ {"Warning: partition %s has size 0 and is bootable\n", 827},
+ {"Warning: partition %s has size 0 and nonzero start\n", 828},
+ {"Warning: partition %s ", 829},
+ {"is not contained in partition %s\n", 830},
+ {"Warning: partitions %s ", 831},
+ {"and %s overlap\n", 832},
{"\
Warning: partition %s contains part of the partition table (sector %lu),\n\
-and will destroy it when filled\n", 832},
- {"Warning: partition %s starts at sector 0\n", 833},
- {"Warning: partition %s extends past end of disk\n", 834},
+and will destroy it when filled\n", 833},
+ {"Warning: partition %s starts at sector 0\n", 834},
+ {"Warning: partition %s extends past end of disk\n", 835},
{"\
Among the primary partitions, at most one can be extended\n\
- (although this is not a problem under Linux)\n", 835},
- {"Warning: partition %s does not start at a cylinder boundary\n", 836},
- {"Warning: partition %s does not end at a cylinder boundary\n", 837},
+ (although this is not a problem under Linux)\n", 836},
+ {"Warning: partition %s does not start at a cylinder boundary\n", 837},
+ {"Warning: partition %s does not end at a cylinder boundary\n", 838},
{"\
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", 838},
+This does not matter for LILO, but the DOS MBR will not boot this disk.\n", 839},
{"\
Warning: usually one can boot from primary partitions only\n\
-LILO disregards the `bootable' flag.\n", 839},
+LILO disregards the `bootable' flag.\n", 840},
{"\
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", 840},
+This does not matter for LILO, but the DOS MBR will not boot this disk.\n", 841},
{"\
-partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 841},
- {"partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 842},
- {"partition %s ends on cylinder %ld, beyond the end of the disk\n", 843},
+partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 842},
+ {"partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 843},
+ {"partition %s ends on cylinder %ld, beyond the end of the disk\n", 844},
{"\
Warning: shifted start of the extd partition from %ld to %ld\n\
-(For listing purposes only. Do not change its contents.)\n", 844},
+(For listing purposes only. Do not change its contents.)\n", 845},
{"\
Warning: extended partition does not start at a cylinder boundary.\n\
-DOS and Linux will interpret the contents differently.\n", 845},
- {"too many partitions - ignoring those past nr (%d)\n", 846},
- {"tree of partitions?\n", 847},
- {"detected Disk Manager - unable to handle that\n", 848},
- {"DM6 signature found - giving up\n", 849},
- {"strange..., an extended partition of size 0?\n", 850},
- {"strange..., a BSD partition of size 0?\n", 851},
- {" %s: unrecognized partition\n", 852},
- {"-n flag was given: Nothing changed\n", 853},
- {"Failed saving the old sectors - aborting\n", 854},
- {"Failed writing the partition on %s\n", 855},
- {"long or incomplete input line - quitting\n", 856},
- {"input error: `=' expected after %s field\n", 857},
- {"input error: unexpected character %c after %s field\n", 858},
- {"unrecognized input: %s\n", 859},
- {"number too big\n", 860},
- {"trailing junk after number\n", 861},
- {"no room for partition descriptor\n", 862},
- {"cannot build surrounding extended partition\n", 863},
- {"too many input fields\n", 864},
- {"No room for more\n", 865},
- {"Illegal type\n", 866},
- {"Warning: given size (%lu) exceeds max allowable size (%lu)\n", 867},
- {"Warning: empty partition\n", 868},
- {"Warning: bad partition start (earliest %lu)\n", 869},
- {"unrecognized bootable flag - choose - or *\n", 870},
- {"partial c,h,s specification?\n", 871},
- {"Extended partition not where expected\n", 872},
- {"bad input\n", 873},
- {"too many partitions\n", 874},
+DOS and Linux will interpret the contents differently.\n", 846},
+ {"too many partitions - ignoring those past nr (%d)\n", 847},
+ {"tree of partitions?\n", 848},
+ {"detected Disk Manager - unable to handle that\n", 849},
+ {"DM6 signature found - giving up\n", 850},
+ {"strange..., an extended partition of size 0?\n", 851},
+ {"strange..., a BSD partition of size 0?\n", 852},
+ {" %s: unrecognized partition\n", 853},
+ {"-n flag was given: Nothing changed\n", 854},
+ {"Failed saving the old sectors - aborting\n", 855},
+ {"Failed writing the partition on %s\n", 856},
+ {"long or incomplete input line - quitting\n", 857},
+ {"input error: `=' expected after %s field\n", 858},
+ {"input error: unexpected character %c after %s field\n", 859},
+ {"unrecognized input: %s\n", 860},
+ {"number too big\n", 861},
+ {"trailing junk after number\n", 862},
+ {"no room for partition descriptor\n", 863},
+ {"cannot build surrounding extended partition\n", 864},
+ {"too many input fields\n", 865},
+ {"No room for more\n", 866},
+ {"Illegal type\n", 867},
+ {"Warning: given size (%lu) exceeds max allowable size (%lu)\n", 868},
+ {"Warning: empty partition\n", 869},
+ {"Warning: bad partition start (earliest %lu)\n", 870},
+ {"unrecognized bootable flag - choose - or *\n", 871},
+ {"partial c,h,s specification?\n", 872},
+ {"Extended partition not where expected\n", 873},
+ {"bad input\n", 874},
+ {"too many partitions\n", 875},
{"\
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", 875},
- {"version", 876},
- {"Usage: %s [options] device ...\n", 877},
- {"device: something like /dev/hda or /dev/sda", 878},
- {"useful options:", 879},
- {" -s [or --show-size]: list size of a partition", 880},
- {" -c [or --id]: print or change partition Id", 881},
- {" -l [or --list]: list partitions of each device", 882},
- {" -d [or --dump]: idem, but in a format suitable for later input", 883},
- {" -i [or --increment]: number cylinders etc. from 1 instead of from 0", 884},
+Usually you only need to specify <start> and <size> (and perhaps <type>).\n", 876},
+ {"version", 877},
+ {"Usage: %s [options] device ...\n", 878},
+ {"device: something like /dev/hda or /dev/sda", 879},
+ {"useful options:", 880},
+ {" -s [or --show-size]: list size of a partition", 881},
+ {" -c [or --id]: print or change partition Id", 882},
+ {" -l [or --list]: list partitions of each device", 883},
+ {" -d [or --dump]: idem, but in a format suitable for later input", 884},
+ {" -i [or --increment]: number cylinders etc. from 1 instead of from 0", 885},
{"\
-uS, -uB, -uC, -uM: accept/report in units of sectors/blocks/cylinders/\
-MB", 885},
- {" -T [or --list-types]:list the known partition types", 886},
- {" -D [or --DOS]: for DOS-compatibility: waste a little space", 887},
- {" -R [or --re-read]: make kernel reread partition table", 888},
- {" -N# : change only the partition with number #", 889},
- {" -n : do not actually write to disk", 890},
- {"\
- -O file : save the sectors that will be overwritten to file", 891},
- {" -I file : restore these sectors again", 892},
- {" -v [or --version]: print version", 893},
- {" -? [or --help]: print this message", 894},
- {"dangerous options:", 895},
- {" -g [or --show-geometry]: print the kernel's idea of the geometry", 896},
+MB", 886},
+ {" -T [or --list-types]:list the known partition types", 887},
+ {" -D [or --DOS]: for DOS-compatibility: waste a little space", 888},
+ {" -R [or --re-read]: make kernel reread partition table", 889},
+ {" -N# : change only the partition with number #", 890},
+ {" -n : do not actually write to disk", 891},
+ {"\
+ -O file : save the sectors that will be overwritten to file", 892},
+ {" -I file : restore these sectors again", 893},
+ {" -v [or --version]: print version", 894},
+ {" -? [or --help]: print this message", 895},
+ {"dangerous options:", 896},
+ {" -g [or --show-geometry]: print the kernel's idea of the geometry", 897},
{"\
-x [or --show-extended]: also list extended partitions on output\n\
- or expect descriptors for them on input", 897},
- {"\
- -L [or --Linux]: do not complain about things irrelevant for Linux", 898},
- {" -q [or --quiet]: suppress warning messages", 899},
- {" You can override the detected geometry using:", 900},
- {" -C# [or --cylinders #]:set the number of cylinders to use", 901},
- {" -H# [or --heads #]: set the number of heads to use", 902},
- {" -S# [or --sectors #]: set the number of sectors to use", 903},
- {"You can disable all consistency checking with:", 904},
- {" -f [or --force]: do what I say, even if it is stupid", 905},
- {"Usage:", 906},
- {"%s device\t\t list active partitions on device\n", 907},
- {"%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n", 908},
- {"%s -An device\t activate partition n, inactivate the other ones\n", 909},
- {"no command?\n", 910},
- {"total: %d blocks\n", 911},
- {"usage: sfdisk --print-id device partition-number\n", 912},
- {"usage: sfdisk --change-id device partition-number Id\n", 913},
- {"usage: sfdisk --id device partition-number [Id]\n", 914},
- {"can specify only one device (except with -l or -s)\n", 915},
- {"cannot open %s read-write\n", 916},
- {"cannot open %s for reading\n", 917},
- {"%s: OK\n", 918},
- {"%s: %ld cylinders, %ld heads, %ld sectors/track\n", 919},
- {"BLKGETSIZE ioctl failed for %s\n", 920},
- {"bad active byte: 0x%x instead of 0x80\n", 921},
+ or expect descriptors for them on input", 898},
+ {"\
+ -L [or --Linux]: do not complain about things irrelevant for Linux", 899},
+ {" -q [or --quiet]: suppress warning messages", 900},
+ {" You can override the detected geometry using:", 901},
+ {" -C# [or --cylinders #]:set the number of cylinders to use", 902},
+ {" -H# [or --heads #]: set the number of heads to use", 903},
+ {" -S# [or --sectors #]: set the number of sectors to use", 904},
+ {"You can disable all consistency checking with:", 905},
+ {" -f [or --force]: do what I say, even if it is stupid", 906},
+ {"Usage:", 907},
+ {"%s device\t\t list active partitions on device\n", 908},
+ {"%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n", 909},
+ {"%s -An device\t activate partition n, inactivate the other ones\n", 910},
+ {"no command?\n", 911},
+ {"total: %d blocks\n", 912},
+ {"usage: sfdisk --print-id device partition-number\n", 913},
+ {"usage: sfdisk --change-id device partition-number Id\n", 914},
+ {"usage: sfdisk --id device partition-number [Id]\n", 915},
+ {"can specify only one device (except with -l or -s)\n", 916},
+ {"cannot open %s read-write\n", 917},
+ {"cannot open %s for reading\n", 918},
+ {"%s: OK\n", 919},
+ {"%s: %ld cylinders, %ld heads, %ld sectors/track\n", 920},
+ {"BLKGETSIZE ioctl failed for %s\n", 921},
+ {"bad active byte: 0x%x instead of 0x80\n", 922},
{"\
Done\n\
-\n", 922},
+\n", 923},
{"\
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", 923},
- {"partition %s has id %x and is not hidden\n", 924},
- {"Bad Id %lx\n", 925},
- {"This disk is currently in use.\n", 926},
- {"Fatal error: cannot find %s\n", 927},
- {"Warning: %s is not a block device\n", 928},
- {"Checking that no-one is using this disk right now ...\n", 929},
+but the DOS MBR will only boot a disk with 1 active partition.\n", 924},
+ {"partition %s has id %x and is not hidden\n", 925},
+ {"Bad Id %lx\n", 926},
+ {"This disk is currently in use.\n", 927},
+ {"Fatal error: cannot find %s\n", 928},
+ {"Warning: %s is not a block device\n", 929},
+ {"Checking that no-one is using this disk right now ...\n", 930},
{"\
\n\
This disk is currently in use - repartitioning is probably a bad idea.\n\
Umount all file systems, and swapoff all swap partitions on this disk.\n\
-Use the --no-reread flag to suppress this check.\n", 930},
- {"Use the --force flag to overrule all checks.\n", 931},
- {"OK\n", 932},
- {"Old situation:\n", 933},
- {"Partition %d does not exist, cannot change it\n", 934},
- {"New situation:\n", 935},
+Use the --no-reread flag to suppress this check.\n", 931},
+ {"Use the --force flag to overrule all checks.\n", 932},
+ {"OK\n", 933},
+ {"Old situation:\n", 934},
+ {"Partition %d does not exist, cannot change it\n", 935},
+ {"New situation:\n", 936},
{"\
I don't like these partitions - nothing changed.\n\
-(If you really want this, use the --force option.)\n", 936},
- {"I don't like this - probably you should answer No\n", 937},
- {"Are you satisfied with this? [ynq] ", 938},
- {"Do you want to write this to disk? [ynq] ", 939},
+(If you really want this, use the --force option.)\n", 937},
+ {"I don't like this - probably you should answer No\n", 938},
+ {"Are you satisfied with this? [ynq] ", 939},
+ {"Do you want to write this to disk? [ynq] ", 940},
{"\
\n\
-sfdisk: premature end of input\n", 940},
- {"Quitting - nothing changed\n", 941},
- {"Please answer one of y,n,q\n", 942},
+sfdisk: premature end of input\n", 941},
+ {"Quitting - nothing changed\n", 942},
+ {"Please answer one of y,n,q\n", 943},
{"\
Successfully wrote the new partition table\n\
-\n", 943},
+\n", 944},
{"\
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", 944},
- {"Try `getopt --help' for more information.\n", 945},
- {"empty long option after -l or --long argument", 946},
- {"unknown shell after -s or --shell argument", 947},
- {"Usage: getopt optstring parameters\n", 948},
- {" getopt [options] [--] optstring parameters\n", 949},
- {" getopt [options] -o|--options optstring [options] [--]\n", 950},
- {" parameters\n", 951},
- {"\
- -a, --alternative Allow long options starting with single -\n", 952},
- {" -h, --help This small usage guide\n", 953},
- {" -l, --longoptions=longopts Long options to be recognized\n", 954},
- {"\
- -n, --name=progname The name under which errors are reported\n", 955},
- {" -o, --options=optstring Short options to be recognized\n", 956},
- {" -q, --quiet Disable error reporting by getopt(3)\n", 957},
- {" -Q, --quiet-output No normal output\n", 958},
- {" -s, --shell=shell Set shell quoting conventions\n", 959},
- {" -T, --test Test for getopt(1) version\n", 960},
- {" -u, --unqote Do not quote the output\n", 961},
- {" -V, --version Output version information\n", 962},
- {"missing optstring argument", 963},
- {"getopt (enhanced) 1.1.2\n", 964},
- {"internal error, contact the author.", 965},
- {"booted from MILO\n", 966},
- {"Ruffian BCD clock\n", 967},
- {"clockport adjusted to 0x%x\n", 968},
- {"funky TOY!\n", 969},
- {"%s: atomic %s failed for 1000 iterations!", 970},
- {"Cannot open /dev/port: %s", 971},
- {"I failed to get permission because I didn't try.\n", 972},
- {"%s is unable to get I/O port access: the iopl(3) call failed.\n", 973},
- {"Probably you need root privileges.\n", 974},
- {"Assuming hardware clock is kept in %s time.\n", 975},
- {"UTC", 976},
- {"local", 977},
- {"%s: Warning: unrecognized third line in adjtime file\n", 978},
- {"(Expected: `UTC' or `LOCAL' or nothing.)\n", 979},
- {"Last drift adjustment done at %ld seconds after 1969\n", 980},
- {"Last calibration done at %ld seconds after 1969\n", 981},
- {"Hardware clock is on %s time\n", 982},
- {"unknown", 983},
- {"Waiting for clock tick...\n", 984},
- {"...got clock tick\n", 985},
- {"Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n", 986},
- {"Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n", 987},
- {"Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n", 988},
- {"Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n", 989},
- {"Clock not changed - testing only.\n", 990},
+(See fdisk(8).)\n", 945},
+ {"Try `getopt --help' for more information.\n", 946},
+ {"empty long option after -l or --long argument", 947},
+ {"unknown shell after -s or --shell argument", 948},
+ {"Usage: getopt optstring parameters\n", 949},
+ {" getopt [options] [--] optstring parameters\n", 950},
+ {" getopt [options] -o|--options optstring [options] [--]\n", 951},
+ {" parameters\n", 952},
+ {"\
+ -a, --alternative Allow long options starting with single -\n", 953},
+ {" -h, --help This small usage guide\n", 954},
+ {" -l, --longoptions=longopts Long options to be recognized\n", 955},
+ {"\
+ -n, --name=progname The name under which errors are reported\n", 956},
+ {" -o, --options=optstring Short options to be recognized\n", 957},
+ {" -q, --quiet Disable error reporting by getopt(3)\n", 958},
+ {" -Q, --quiet-output No normal output\n", 959},
+ {" -s, --shell=shell Set shell quoting conventions\n", 960},
+ {" -T, --test Test for getopt(1) version\n", 961},
+ {" -u, --unqote Do not quote the output\n", 962},
+ {" -V, --version Output version information\n", 963},
+ {"missing optstring argument", 964},
+ {"getopt (enhanced) 1.1.2\n", 965},
+ {"internal error, contact the author.", 966},
+ {"booted from MILO\n", 967},
+ {"Ruffian BCD clock\n", 968},
+ {"clockport adjusted to 0x%x\n", 969},
+ {"funky TOY!\n", 970},
+ {"%s: atomic %s failed for 1000 iterations!", 971},
+ {"Cannot open /dev/port: %s", 972},
+ {"I failed to get permission because I didn't try.\n", 973},
+ {"%s is unable to get I/O port access: the iopl(3) call failed.\n", 974},
+ {"Probably you need root privileges.\n", 975},
+ {"Assuming hardware clock is kept in %s time.\n", 976},
+ {"UTC", 977},
+ {"local", 978},
+ {"%s: Warning: unrecognized third line in adjtime file\n", 979},
+ {"(Expected: `UTC' or `LOCAL' or nothing.)\n", 980},
+ {"Last drift adjustment done at %ld seconds after 1969\n", 981},
+ {"Last calibration done at %ld seconds after 1969\n", 982},
+ {"Hardware clock is on %s time\n", 983},
+ {"unknown", 984},
+ {"Waiting for clock tick...\n", 985},
+ {"...got clock tick\n", 986},
+ {"Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n", 987},
+ {"Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n", 988},
+ {"Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n", 989},
+ {"Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n", 990},
+ {"Clock not changed - testing only.\n", 991},
{"\
Time elapsed since reference time has been %.6f seconds.\n\
-Delaying further to reach the next full second.\n", 991},
+Delaying further to reach the next full second.\n", 992},
{"\
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", 992},
- {"%s %.6f seconds\n", 993},
- {"No --date option specified.\n", 994},
- {"--date argument too long\n", 995},
+50th day of month) or beyond the range we can handle (e.g. Year 2095).\n", 993},
+ {"%s %.6f seconds\n", 994},
+ {"No --date option specified.\n", 995},
+ {"--date argument too long\n", 996},
{"\
The value of the --date option is not a valid date.\n\
-In particular, it contains quotation marks.\n", 996},
- {"Issuing date command: %s\n", 997},
- {"Unable to run 'date' program in /bin/sh shell. popen() failed", 998},
- {"response from date command = %s\n", 999},
+In particular, it contains quotation marks.\n", 997},
+ {"Issuing date command: %s\n", 998},
+ {"Unable to run 'date' program in /bin/sh shell. popen() failed", 999},
+ {"response from date command = %s\n", 1000},
{"\
The date command issued by %s returned unexpected results.\n\
The command was:\n\
%s\n\
The response was:\n\
- %s\n", 1000},
+ %s\n", 1001},
{"\
The date command issued by %s returned something other than an integer where \
the converted time value was expected.\n\
The command was:\n\
%s\n\
The response was:\n\
- %s\n", 1001},
- {"date string %s equates to %ld seconds since 1969.\n", 1002},
+ %s\n", 1002},
+ {"date string %s equates to %ld seconds since 1969.\n", 1003},
{"\
The Hardware Clock does not contain a valid time, so we cannot set the \
-System Time from it.\n", 1003},
- {"Calling settimeofday:\n", 1004},
- {"\ttv.tv_sec = %ld, tv.tv_usec = %ld\n", 1005},
- {"\ttz.tz_minuteswest = %d\n", 1006},
- {"Not setting system clock because running in test mode.\n", 1007},
- {"Must be superuser to set system clock.\n", 1008},
- {"settimeofday() failed", 1009},
+System Time from it.\n", 1004},
+ {"Calling settimeofday:\n", 1005},
+ {"\ttv.tv_sec = %ld, tv.tv_usec = %ld\n", 1006},
+ {"\ttz.tz_minuteswest = %d\n", 1007},
+ {"Not setting system clock because running in test mode.\n", 1008},
+ {"Must be superuser to set system clock.\n", 1009},
+ {"settimeofday() failed", 1010},
{"\
Not adjusting drift factor because the Hardware Clock previously contained \
-garbage.\n", 1010},
+garbage.\n", 1011},
{"\
Not adjusting drift factor because it has been less than a day since the \
-last calibration.\n", 1011},
+last calibration.\n", 1012},
{"\
-Clock drifted %d seconds in the past %d seconds in spite of a drift factor \
+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", 1012},
- {"Time since last adjustment is %d seconds\n", 1013},
- {"Need to insert %d seconds and refer time back %.6f seconds ago\n", 1014},
- {"Not updating adjtime file because of testing mode.\n", 1015},
+Adjusting drift factor by %f seconds/day\n", 1013},
+ {"Time since last adjustment is %d seconds\n", 1014},
+ {"Need to insert %d seconds and refer time back %.6f seconds ago\n", 1015},
+ {"Not updating adjtime file because of testing mode.\n", 1016},
{"\
Would have written the following to %s:\n\
-%s", 1016},
- {"Drift adjustment parameters not updated.\n", 1017},
+%s", 1017},
+ {"Drift adjustment parameters not updated.\n", 1018},
{"\
-The Hardware Clock does not contain a valid time, so we cannot adjust it.\n", 1018},
- {"Needed adjustment is less than one second, so not setting clock.\n", 1019},
- {"Using %s.\n", 1020},
- {"No usable clock interface found.\n", 1021},
- {"Unable to set system clock.\n", 1022},
+The Hardware Clock does not contain a valid time, so we cannot adjust it.\n", 1019},
+ {"Needed adjustment is less than one second, so not setting clock.\n", 1020},
+ {"Using %s.\n", 1021},
+ {"No usable clock interface found.\n", 1022},
+ {"Unable to set system clock.\n", 1023},
{"\
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", 1023},
- {"Unable to get the epoch value from the kernel.\n", 1024},
- {"Kernel is assuming an epoch value of %lu\n", 1025},
+(and thus is presumably not running on an Alpha now). No action taken.\n", 1024},
+ {"Unable to get the epoch value from the kernel.\n", 1025},
+ {"Kernel is assuming an epoch value of %lu\n", 1026},
{"\
To set the epoch value, you must use the 'epoch' option to tell to what \
-value to set it.\n", 1026},
- {"Not setting the epoch to %d - testing only.\n", 1027},
- {"Unable to set the epoch value in the kernel.\n", 1028},
+value to set it.\n", 1027},
+ {"Not setting the epoch to %d - testing only.\n", 1028},
+ {"Unable to set the epoch value in the kernel.\n", 1029},
{"\
hwclock - query and set the hardware clock (RTC)\n\
\n\
@@ -1408,47 +1409,46 @@ Options: \n\
--epoch=year specifies the year which is the beginning of the \n\
hardware clock's epoch value\n\
--noadjfile do not access /etc/adjtime. Requires the use of\n\
- either --utc or --localtime\n", 1029},
+ either --utc or --localtime\n", 1030},
{"\
--jensen, --arc, --srm, --funky-toy\n\
- tell hwclock the type of alpha you have (see hwclock(8))\n", 1030},
- {"%s takes no non-option arguments. You supplied %d.\n", 1031},
+ tell hwclock the type of alpha you have (see hwclock(8))\n", 1031},
+ {"%s takes no non-option arguments. You supplied %d.\n", 1032},
{"\
-You have specified multiple function options.\n\
-You can only perform one function at a time.\n", 1032},
+You have specified multiple functions.\n\
+You can only perform one function at a time.\n", 1033},
{"\
%s: The --utc and --localtime options are mutually exclusive. You specified \
-both.\n", 1033},
+both.\n", 1034},
{"\
%s: The --adjust and --noadjfile options are mutually exclusive. You \
-specified both.\n", 1034},
- {"%s: With --noadjfile, you must specify either --utc or --localtime\n", 1035},
- {"No usable set-to time. Cannot set clock.\n", 1036},
- {"Sorry, only the superuser can change the Hardware Clock.\n", 1037},
- {"Sorry, only the superuser can change the System Clock.\n", 1038},
+specified both.\n", 1035},
+ {"%s: With --noadjfile, you must specify either --utc or --localtime\n", 1036},
+ {"No usable set-to time. Cannot set clock.\n", 1037},
+ {"Sorry, only the superuser can change the Hardware Clock.\n", 1038},
+ {"Sorry, only the superuser can change the System Clock.\n", 1039},
{"\
Sorry, only the superuser can change the Hardware Clock epoch in the \
-kernel.\n", 1039},
- {"Cannot access the Hardware Clock via any known method.\n", 1040},
+kernel.\n", 1040},
+ {"Cannot access the Hardware Clock via any known method.\n", 1041},
{"\
Use the --debug option to see the details of our search for an access \
-method.\n", 1041},
- {"Waiting in loop for time from KDGHWCLK to change\n", 1042},
- {"KDGHWCLK ioctl to read time failed", 1043},
- {"Timed out waiting for time change.\n", 1044},
- {"KDGHWCLK ioctl to read time failed in loop", 1045},
- {"ioctl() failed to read time from %s", 1046},
- {"ioctl KDSHWCLK failed", 1047},
- {"Can't open /dev/tty1 or /dev/vc/1", 1048},
- {"KDGHWCLK ioctl failed", 1049},
- {"ioctl() to %s to read the time failed.\n", 1050},
- {"Waiting in loop for time from %s to change\n", 1051},
- {"open() of %s failed", 1052},
- {"%s does not have interrupt functions. ", 1053},
- {"read() to %s to wait for clock tick failed", 1054},
- {"ioctl() to %s to turn off update interrupts failed", 1055},
- {"ioctl() to %s to turn on update interrupts failed unexpectedly", 1056},
- {"Unable to open %s", 1057},
+method.\n", 1042},
+ {"Waiting in loop for time from KDGHWCLK to change\n", 1043},
+ {"KDGHWCLK ioctl to read time failed", 1044},
+ {"Timed out waiting for time change.\n", 1045},
+ {"KDGHWCLK ioctl to read time failed in loop", 1046},
+ {"ioctl() failed to read time from %s", 1047},
+ {"ioctl KDSHWCLK failed", 1048},
+ {"Can't open /dev/tty1 or /dev/vc/1", 1049},
+ {"KDGHWCLK ioctl failed", 1050},
+ {"open() of %s failed", 1051},
+ {"ioctl() to %s to read the time failed.\n", 1052},
+ {"Waiting in loop for time from %s to change\n", 1053},
+ {"%s does not have interrupt functions. ", 1054},
+ {"read() to %s to wait for clock tick failed", 1055},
+ {"ioctl() to %s to turn off update interrupts failed", 1056},
+ {"ioctl() to %s to turn on update interrupts failed unexpectedly", 1057},
{"ioctl() to %s to set the time failed.\n", 1058},
{"ioctl(%s) was successful.\n", 1059},
{"Open of %s failed", 1060},
@@ -1456,513 +1456,509 @@ method.\n", 1041},
To manipulate the epoch value in the kernel, we must access the Linux 'rtc' \
device driver via the device special file %s. This file does not exist on \
this system.\n", 1061},
- {"ioctl(RTC_EPOCH_READ) to %s failed", 1062},
- {"we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n", 1063},
- {"The epoch value may not be less than 1900. You requested %ld\n", 1064},
- {"setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n", 1065},
- {"\
-The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n", 1066},
- {"ioctl(RTC_EPOCH_SET) to %s failed", 1067},
- {"invalid number `%s'\n", 1068},
- {"number `%s' to `%s' out of range\n", 1069},
- {"unrecognized option `%s'\n", 1070},
- {"option `%s' requires an argument\n", 1071},
- {"option `%s' doesn't allow an argument\n", 1072},
- {"unrecognized option `-%c'\n", 1073},
- {"calling open_tty\n", 1074},
- {"calling termio_init\n", 1075},
- {"writing init string\n", 1076},
- {"before autobaud\n", 1077},
- {"waiting for cr-lf\n", 1078},
- {"read %c\n", 1079},
- {"reading login name\n", 1080},
- {"%s: can't exec %s: %m", 1081},
- {"can't malloc initstring", 1082},
- {"bad timeout value: %s", 1083},
- {"after getopt loop\n", 1084},
- {"exiting parseargs\n", 1085},
- {"entered parse_speeds\n", 1086},
- {"bad speed: %s", 1087},
- {"too many alternate speeds", 1088},
- {"exiting parsespeeds\n", 1089},
- {"/dev: chdir() failed: %m", 1090},
- {"/dev/%s: not a character device", 1091},
- {"open(2)\n", 1092},
- {"/dev/%s: cannot open as standard input: %m", 1093},
- {"%s: not open for read/write", 1094},
- {"duping\n", 1095},
- {"%s: dup problem: %m", 1096},
- {"term_io 2\n", 1097},
- {"user", 1098},
- {"users", 1099},
- {"%s: read: %m", 1100},
- {"%s: input overrun", 1101},
+ {"Unable to open %s", 1062},
+ {"ioctl(RTC_EPOCH_READ) to %s failed", 1063},
+ {"we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n", 1064},
+ {"The epoch value may not be less than 1900. You requested %ld\n", 1065},
+ {"setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n", 1066},
+ {"\
+The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n", 1067},
+ {"ioctl(RTC_EPOCH_SET) to %s failed", 1068},
+ {"calling open_tty\n", 1069},
+ {"calling termio_init\n", 1070},
+ {"writing init string\n", 1071},
+ {"before autobaud\n", 1072},
+ {"waiting for cr-lf\n", 1073},
+ {"read %c\n", 1074},
+ {"reading login name\n", 1075},
+ {"%s: can't exec %s: %m", 1076},
+ {"can't malloc initstring", 1077},
+ {"bad timeout value: %s", 1078},
+ {"after getopt loop\n", 1079},
+ {"exiting parseargs\n", 1080},
+ {"entered parse_speeds\n", 1081},
+ {"bad speed: %s", 1082},
+ {"too many alternate speeds", 1083},
+ {"exiting parsespeeds\n", 1084},
+ {"/dev: chdir() failed: %m", 1085},
+ {"/dev/%s: not a character device", 1086},
+ {"open(2)\n", 1087},
+ {"/dev/%s: cannot open as standard input: %m", 1088},
+ {"%s: not open for read/write", 1089},
+ {"duping\n", 1090},
+ {"%s: dup problem: %m", 1091},
+ {"term_io 2\n", 1092},
+ {"user", 1093},
+ {"users", 1094},
+ {"%s: read: %m", 1095},
+ {"%s: input overrun", 1096},
{"\
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", 1102},
- {"login: memory low, login may fail\n", 1103},
- {"can't malloc for ttyclass", 1104},
- {"can't malloc for grplist", 1105},
- {"Login on %s from %s denied by default.\n", 1106},
- {"Login on %s from %s denied.\n", 1107},
- {"%s: you (user %d) don't exist.\n", 1108},
- {"%s: user \"%s\" does not exist.\n", 1109},
- {"%s: can only change local entries; use yp%s instead.\n", 1110},
- {"Changing finger information for %s.\n", 1111},
- {"Password error.", 1112},
- {"Password: ", 1113},
- {"Incorrect password.", 1114},
- {"Finger information not changed.\n", 1115},
- {"Usage: %s [ -f full-name ] [ -o office ] ", 1116},
+line baud_rate,... [termtype]\n", 1097},
+ {"login: memory low, login may fail\n", 1098},
+ {"can't malloc for ttyclass", 1099},
+ {"can't malloc for grplist", 1100},
+ {"Login on %s from %s denied by default.\n", 1101},
+ {"Login on %s from %s denied.\n", 1102},
+ {"%s: you (user %d) don't exist.\n", 1103},
+ {"%s: user \"%s\" does not exist.\n", 1104},
+ {"%s: can only change local entries; use yp%s instead.\n", 1105},
+ {"Changing finger information for %s.\n", 1106},
+ {"Password error.", 1107},
+ {"Password: ", 1108},
+ {"Incorrect password.", 1109},
+ {"Finger information not changed.\n", 1110},
+ {"Usage: %s [ -f full-name ] [ -o office ] ", 1111},
{"\
[ -p office-phone ]\n\
-\t[ -h home-phone ] ", 1117},
- {"[ --help ] [ --version ]\n", 1118},
+\t[ -h home-phone ] ", 1112},
+ {"[ --help ] [ --version ]\n", 1113},
{"\
\n\
-Aborted.\n", 1119},
- {"field is too long.\n", 1120},
- {"'%c' is not allowed.\n", 1121},
- {"Control characters are not allowed.\n", 1122},
- {"Finger information *NOT* changed. Try again later.\n", 1123},
- {"Finger information changed.\n", 1124},
- {"malloc failed", 1125},
- {"%s: Your shell is not in /etc/shells, shell change denied\n", 1126},
- {"Changing shell for %s.\n", 1127},
- {"New shell", 1128},
- {"Shell not changed.\n", 1129},
- {"Shell *NOT* changed. Try again later.\n", 1130},
- {"Shell changed.\n", 1131},
+Aborted.\n", 1114},
+ {"field is too long.\n", 1115},
+ {"'%c' is not allowed.\n", 1116},
+ {"Control characters are not allowed.\n", 1117},
+ {"Finger information *NOT* changed. Try again later.\n", 1118},
+ {"Finger information changed.\n", 1119},
+ {"malloc failed", 1120},
+ {"%s: Your shell is not in /etc/shells, shell change denied\n", 1121},
+ {"Changing shell for %s.\n", 1122},
+ {"New shell", 1123},
+ {"Shell not changed.\n", 1124},
+ {"Shell *NOT* changed. Try again later.\n", 1125},
+ {"Shell changed.\n", 1126},
{"\
Usage: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n\
- [ username ]\n", 1132},
- {"%s: shell must be a full path name.\n", 1133},
- {"%s: \"%s\" does not exist.\n", 1134},
- {"%s: \"%s\" is not executable.\n", 1135},
- {"%s: '%c' is not allowed.\n", 1136},
- {"%s: Control characters are not allowed.\n", 1137},
- {"Warning: \"%s\" is not listed in /etc/shells\n", 1138},
- {"%s: \"%s\" is not listed in /etc/shells.\n", 1139},
- {"%s: use -l option to see list\n", 1140},
- {"Warning: \"%s\" is not listed in /etc/shells.\n", 1141},
- {"Use %s -l to see list.\n", 1142},
- {"No known shells.\n", 1143},
- {"couldn't open /dev/urandom", 1144},
- {"couldn't read random data from /dev/urandom", 1145},
- {"can't open %s for reading", 1146},
- {"can't stat(%s)", 1147},
- {"%s doesn't have the correct filemodes", 1148},
- {"can't read data from %s", 1149},
- {"Can't read %s, exiting.", 1150},
- {"usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n", 1151},
- {" still logged in", 1152},
+ [ username ]\n", 1127},
+ {"%s: shell must be a full path name.\n", 1128},
+ {"%s: \"%s\" does not exist.\n", 1129},
+ {"%s: \"%s\" is not executable.\n", 1130},
+ {"%s: '%c' is not allowed.\n", 1131},
+ {"%s: Control characters are not allowed.\n", 1132},
+ {"Warning: \"%s\" is not listed in /etc/shells\n", 1133},
+ {"%s: \"%s\" is not listed in /etc/shells.\n", 1134},
+ {"%s: use -l option to see list\n", 1135},
+ {"Warning: \"%s\" is not listed in /etc/shells.\n", 1136},
+ {"Use %s -l to see list.\n", 1137},
+ {"No known shells.\n", 1138},
+ {"couldn't open /dev/urandom", 1139},
+ {"couldn't read random data from /dev/urandom", 1140},
+ {"can't open %s for reading", 1141},
+ {"can't stat(%s)", 1142},
+ {"%s doesn't have the correct filemodes", 1143},
+ {"can't read data from %s", 1144},
+ {"Can't read %s, exiting.", 1145},
+ {"usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n", 1146},
+ {" still logged in", 1147},
{"\
\n\
-wtmp begins %s", 1153},
- {"last: malloc failure.\n", 1154},
- {"last: gethostname", 1155},
+wtmp begins %s", 1148},
+ {"last: malloc failure.\n", 1149},
+ {"last: gethostname", 1150},
{"\
\n\
-interrupted %10.10s %5.5s \n", 1156},
- {"FATAL: can't reopen tty: %s", 1157},
- {"login: -h for super-user only.\n", 1158},
- {"usage: login [-fp] [username]\n", 1159},
- {"login: PAM Failure, aborting: %s\n", 1160},
- {"Couldn't initialize PAM: %s", 1161},
- {"login: ", 1162},
- {"FAILED LOGIN %d FROM %s FOR %s, %s", 1163},
+interrupted %10.10s %5.5s \n", 1151},
+ {"FATAL: can't reopen tty: %s", 1152},
+ {"login: -h for super-user only.\n", 1153},
+ {"usage: login [-fp] [username]\n", 1154},
+ {"login: PAM Failure, aborting: %s\n", 1155},
+ {"Couldn't initialize PAM: %s", 1156},
+ {"login: ", 1157},
+ {"FAILED LOGIN %d FROM %s FOR %s, %s", 1158},
{"\
Login incorrect\n\
-\n", 1164},
- {"TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s", 1165},
- {"FAILED LOGIN SESSION FROM %s FOR %s, %s", 1166},
+\n", 1159},
+ {"TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s", 1160},
+ {"FAILED LOGIN SESSION FROM %s FOR %s, %s", 1161},
{"\
\n\
-Login incorrect\n", 1167},
+Login incorrect\n", 1162},
{"\
\n\
-Session setup problem, abort.\n", 1168},
- {"NULL user name in %s:%d. Abort.", 1169},
- {"Invalid user name \"%s\" in %s:%d. Abort.", 1170},
- {"login: Out of memory\n", 1171},
- {"Illegal username", 1172},
- {"%s login refused on this terminal.\n", 1173},
- {"LOGIN %s REFUSED FROM %s ON TTY %s", 1174},
- {"LOGIN %s REFUSED ON TTY %s", 1175},
- {"Login incorrect\n", 1176},
+Session setup problem, abort.\n", 1163},
+ {"NULL user name in %s:%d. Abort.", 1164},
+ {"Invalid user name \"%s\" in %s:%d. Abort.", 1165},
+ {"login: Out of memory\n", 1166},
+ {"Illegal username", 1167},
+ {"%s login refused on this terminal.\n", 1168},
+ {"LOGIN %s REFUSED FROM %s ON TTY %s", 1169},
+ {"LOGIN %s REFUSED ON TTY %s", 1170},
+ {"Login incorrect\n", 1171},
{"\
Too many users logged on already.\n\
-Try again later.\n", 1177},
- {"You have too many processes running.\n", 1178},
- {"DIALUP AT %s BY %s", 1179},
- {"ROOT LOGIN ON %s FROM %s", 1180},
- {"ROOT LOGIN ON %s", 1181},
- {"LOGIN ON %s BY %s FROM %s", 1182},
- {"LOGIN ON %s BY %s", 1183},
- {"You have new mail.\n", 1184},
- {"You have mail.\n", 1185},
- {"login: failure forking: %s", 1186},
- {"TIOCSCTTY failed: %m", 1187},
- {"setuid() failed", 1188},
- {"No directory %s!\n", 1189},
- {"Logging in with home = \"/\".\n", 1190},
- {"login: no memory for shell script.\n", 1191},
- {"login: couldn't exec shell script: %s.\n", 1192},
- {"login: no shell: %s.\n", 1193},
+Try again later.\n", 1172},
+ {"You have too many processes running.\n", 1173},
+ {"DIALUP AT %s BY %s", 1174},
+ {"ROOT LOGIN ON %s FROM %s", 1175},
+ {"ROOT LOGIN ON %s", 1176},
+ {"LOGIN ON %s BY %s FROM %s", 1177},
+ {"LOGIN ON %s BY %s", 1178},
+ {"You have new mail.\n", 1179},
+ {"You have mail.\n", 1180},
+ {"login: failure forking: %s", 1181},
+ {"TIOCSCTTY failed: %m", 1182},
+ {"setuid() failed", 1183},
+ {"No directory %s!\n", 1184},
+ {"Logging in with home = \"/\".\n", 1185},
+ {"login: no memory for shell script.\n", 1186},
+ {"login: couldn't exec shell script: %s.\n", 1187},
+ {"login: no shell: %s.\n", 1188},
{"\
\n\
-%s login: ", 1194},
- {"login name much too long.\n", 1195},
- {"NAME too long", 1196},
- {"login names may not start with '-'.\n", 1197},
- {"too many bare linefeeds.\n", 1198},
- {"EXCESSIVE linefeeds", 1199},
- {"Login timed out after %d seconds\n", 1200},
- {"Last login: %.*s ", 1201},
- {"from %.*s\n", 1202},
- {"on %.*s\n", 1203},
- {"LOGIN FAILURE FROM %s, %s", 1204},
- {"LOGIN FAILURE ON %s, %s", 1205},
- {"%d LOGIN FAILURES FROM %s, %s", 1206},
- {"%d LOGIN FAILURES ON %s, %s", 1207},
- {"is y\n", 1208},
- {"is n\n", 1209},
- {"usage: mesg [y | n]\n", 1210},
- {"newgrp: Who are you?", 1211},
- {"newgrp: setgid", 1212},
- {"newgrp: No such group.", 1213},
- {"newgrp: Permission denied", 1214},
- {"newgrp: setuid", 1215},
- {"No shell", 1216},
- {"The password must have at least 6 characters, try again.\n", 1217},
+%s login: ", 1189},
+ {"login name much too long.\n", 1190},
+ {"NAME too long", 1191},
+ {"login names may not start with '-'.\n", 1192},
+ {"too many bare linefeeds.\n", 1193},
+ {"EXCESSIVE linefeeds", 1194},
+ {"Login timed out after %d seconds\n", 1195},
+ {"Last login: %.*s ", 1196},
+ {"from %.*s\n", 1197},
+ {"on %.*s\n", 1198},
+ {"LOGIN FAILURE FROM %s, %s", 1199},
+ {"LOGIN FAILURE ON %s, %s", 1200},
+ {"%d LOGIN FAILURES FROM %s, %s", 1201},
+ {"%d LOGIN FAILURES ON %s, %s", 1202},
+ {"is y\n", 1203},
+ {"is n\n", 1204},
+ {"usage: mesg [y | n]\n", 1205},
+ {"newgrp: Who are you?", 1206},
+ {"newgrp: setgid", 1207},
+ {"newgrp: No such group.", 1208},
+ {"newgrp: Permission denied", 1209},
+ {"newgrp: setuid", 1210},
+ {"No shell", 1211},
+ {"The password must have at least 6 characters, try again.\n", 1212},
{"\
The password must contain characters out of two of the following\n\
classes: upper and lower case letters, digits and non alphanumeric\n\
-characters. See passwd(1) for more information.\n", 1218},
- {"You cannot reuse the old password.\n", 1219},
- {"Please don't use something like your username as password!\n", 1220},
- {"Please don't use something like your realname as password!\n", 1221},
- {"Usage: passwd [username [password]]\n", 1222},
- {"Only root may use the one and two argument forms.\n", 1223},
- {"Usage: passwd [-foqsvV] [user [password]]\n", 1224},
- {"Can't exec %s: %s\n", 1225},
- {"Cannot find login name", 1226},
- {"Only root can change the password for others.\n", 1227},
- {"Too many arguments.\n", 1228},
- {"Can't find username anywhere. Is `%s' really a user?", 1229},
- {"Sorry, I can only change local passwords. Use yppasswd instead.", 1230},
- {"UID and username does not match, imposter!", 1231},
- {"Changing password for %s\n", 1232},
- {"Enter old password: ", 1233},
- {"Illegal password, imposter.", 1234},
- {"Enter new password: ", 1235},
- {"Password not changed.", 1236},
- {"Re-type new password: ", 1237},
- {"You misspelled it. Password not changed.", 1238},
- {"password changed, user %s", 1239},
- {"ROOT PASSWORD CHANGED", 1240},
- {"password changed by root, user %s", 1241},
- {"calling setpwnam to set password.\n", 1242},
- {"Password *NOT* changed. Try again later.\n", 1243},
- {"Password changed.\n", 1244},
- {"Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n", 1245},
- {"Shutdown process aborted", 1246},
- {"%s: Only root can shut a system down.\n", 1247},
- {"That must be tomorrow, can't you wait till then?\n", 1248},
- {"for maintenance; bounce, bounce", 1249},
- {"timeout = %d, quiet = %d, reboot = %d\n", 1250},
- {"The system is being shut down within 5 minutes", 1251},
- {"Login is therefore prohibited.", 1252},
- {"rebooted by %s: %s", 1253},
- {"halted by %s: %s", 1254},
+characters. See passwd(1) for more information.\n", 1213},
+ {"You cannot reuse the old password.\n", 1214},
+ {"Please don't use something like your username as password!\n", 1215},
+ {"Please don't use something like your realname as password!\n", 1216},
+ {"Usage: passwd [username [password]]\n", 1217},
+ {"Only root may use the one and two argument forms.\n", 1218},
+ {"Usage: passwd [-foqsvV] [user [password]]\n", 1219},
+ {"Can't exec %s: %s\n", 1220},
+ {"Cannot find login name", 1221},
+ {"Only root can change the password for others.\n", 1222},
+ {"Too many arguments.\n", 1223},
+ {"Can't find username anywhere. Is `%s' really a user?", 1224},
+ {"Sorry, I can only change local passwords. Use yppasswd instead.", 1225},
+ {"UID and username does not match, imposter!", 1226},
+ {"Changing password for %s\n", 1227},
+ {"Enter old password: ", 1228},
+ {"Illegal password, imposter.", 1229},
+ {"Enter new password: ", 1230},
+ {"Password not changed.", 1231},
+ {"Re-type new password: ", 1232},
+ {"You misspelled it. Password not changed.", 1233},
+ {"password changed, user %s", 1234},
+ {"ROOT PASSWORD CHANGED", 1235},
+ {"password changed by root, user %s", 1236},
+ {"calling setpwnam to set password.\n", 1237},
+ {"Password *NOT* changed. Try again later.\n", 1238},
+ {"Password changed.\n", 1239},
+ {"Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n", 1240},
+ {"Shutdown process aborted", 1241},
+ {"%s: Only root can shut a system down.\n", 1242},
+ {"That must be tomorrow, can't you wait till then?\n", 1243},
+ {"for maintenance; bounce, bounce", 1244},
+ {"timeout = %d, quiet = %d, reboot = %d\n", 1245},
+ {"The system is being shut down within 5 minutes", 1246},
+ {"Login is therefore prohibited.", 1247},
+ {"rebooted by %s: %s", 1248},
+ {"halted by %s: %s", 1249},
{"\
\n\
-Why am I still alive after reboot?", 1255},
+Why am I still alive after reboot?", 1250},
{"\
\n\
-Now you can turn off the power...", 1256},
- {"Calling kernel power-off facility...\n", 1257},
- {"Error powering off\t%s\n", 1258},
- {"Executing the program \"%s\" ...\n", 1259},
- {"Error executing\t%s\n", 1260},
- {"URGENT: broadcast message from %s:", 1261},
- {"System going down in %d hours %d minutes", 1262},
- {"System going down in 1 hour %d minutes", 1263},
- {"System going down in %d minutes\n", 1264},
- {"System going down in 1 minute\n", 1265},
- {"System going down IMMEDIATELY!\n", 1266},
- {"\t... %s ...\n", 1267},
- {"Cannot fork for swapoff. Shrug!", 1268},
- {"Cannot exec swapoff, hoping umount will do the trick.", 1269},
- {"Cannot fork for umount, trying manually.", 1270},
- {"Cannot exec %s, trying umount.\n", 1271},
- {"Cannot exec umount, giving up on umount.", 1272},
- {"Unmounting any remaining filesystems...", 1273},
- {"shutdown: Couldn't umount %s: %s\n", 1274},
- {"Booting to single user mode.\n", 1275},
- {"exec of single user shell failed\n", 1276},
- {"fork of single user shell failed\n", 1277},
- {"error opening fifo\n", 1278},
- {"error running finalprog\n", 1279},
- {"error forking finalprog\n", 1280},
+Now you can turn off the power...", 1251},
+ {"Calling kernel power-off facility...\n", 1252},
+ {"Error powering off\t%s\n", 1253},
+ {"Executing the program \"%s\" ...\n", 1254},
+ {"Error executing\t%s\n", 1255},
+ {"URGENT: broadcast message from %s:", 1256},
+ {"System going down in %d hours %d minutes", 1257},
+ {"System going down in 1 hour %d minutes", 1258},
+ {"System going down in %d minutes\n", 1259},
+ {"System going down in 1 minute\n", 1260},
+ {"System going down IMMEDIATELY!\n", 1261},
+ {"\t... %s ...\n", 1262},
+ {"Cannot fork for swapoff. Shrug!", 1263},
+ {"Cannot exec swapoff, hoping umount will do the trick.", 1264},
+ {"Cannot fork for umount, trying manually.", 1265},
+ {"Cannot exec %s, trying umount.\n", 1266},
+ {"Cannot exec umount, giving up on umount.", 1267},
+ {"Unmounting any remaining filesystems...", 1268},
+ {"shutdown: Couldn't umount %s: %s\n", 1269},
+ {"Booting to single user mode.\n", 1270},
+ {"exec of single user shell failed\n", 1271},
+ {"fork of single user shell failed\n", 1272},
+ {"error opening fifo\n", 1273},
+ {"error running finalprog\n", 1274},
+ {"error forking finalprog\n", 1275},
{"\
\n\
-Wrong password.\n", 1281},
- {"lstat of path failed\n", 1282},
- {"stat of path failed\n", 1283},
- {"open of directory failed\n", 1284},
- {"fork failed\n", 1285},
- {"exec failed\n", 1286},
- {"cannot open inittab\n", 1287},
- {"no TERM or cannot stat tty\n", 1288},
- {"error stopping service: \"%s\"", 1289},
- {"too many iov's (change code in wall/ttymsg.c)", 1290},
- {"excessively long line arg", 1291},
- {"cannot fork", 1292},
- {"fork: %s", 1293},
- {"%s: BAD ERROR", 1294},
- {"%s: the password file is busy.\n", 1295},
- {"%s: the group file is busy.\n", 1296},
- {"%s: the %s file is busy (%s present)\n", 1297},
- {"%s: can't link %s: %s\n", 1298},
- {"%s: can't unlock %s: %s (your changes are still in %s)\n", 1299},
- {"%s: Cannot fork\n", 1300},
- {"%s: %s unchanged\n", 1301},
- {"%s: no changes made\n", 1302},
- {"You are using shadow groups on this system.\n", 1303},
- {"You are using shadow passwords on this system.\n", 1304},
- {"Would you like to edit %s now [y/n]? ", 1305},
- {"usage: %s [file]\n", 1306},
- {"%s: can't open temporary file.\n", 1307},
- {"Broadcast Message from %s@%s", 1308},
- {"%s: will not read %s - use stdin.\n", 1309},
- {"%s: can't read %s.\n", 1310},
- {"%s: can't stat temporary file.\n", 1311},
- {"%s: can't read temporary file.\n", 1312},
- {"illegal month value: use 1-12", 1313},
- {"illegal year value: use 1-9999", 1314},
- {"%s %d", 1315},
- {"usage: cal [-13smjyV] [[month] year]\n", 1316},
- {"usage: %s [+format] [day month year]\n", 1317},
- {"St. Tib's Day", 1318},
- {"%s: unknown signal %s\n", 1319},
- {"%s: can't find process \"%s\"\n", 1320},
- {"%s: unknown signal %s; valid signals:\n", 1321},
- {"usage: %s [ -s signal | -p ] [ -a ] pid ...\n", 1322},
- {" %s -l [ signal ]\n", 1323},
- {"logger: %s: %s.\n", 1324},
- {"logger: unknown facility name: %s.\n", 1325},
- {"logger: unknown priority name: %s.\n", 1326},
- {"\
-usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n", 1327},
- {"usage: look [-dfa] [-t char] string [file]\n", 1328},
- {"Could not open %s\n", 1329},
- {"Got %d bytes from %s\n", 1330},
- {"namei: unable to get current directory - %s\n", 1331},
- {"namei: unable to chdir to %s - %s (%d)\n", 1332},
- {"usage: namei [-mx] pathname [pathname ...]\n", 1333},
- {"namei: could not chdir to root!\n", 1334},
- {"namei: could not stat root!\n", 1335},
- {"namei: buf overflow\n", 1336},
- {" ? could not chdir into %s - %s (%d)\n", 1337},
- {" ? problems reading symlink %s - %s (%d)\n", 1338},
- {" *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n", 1339},
- {"namei: unknown file type 0%06o on file %s\n", 1340},
- {"%s: out of memory\n", 1341},
- {"%s: renaming %s to %s failed: %s\n", 1342},
- {"call: %s from to files...\n", 1343},
+Wrong password.\n", 1276},
+ {"lstat of path failed\n", 1277},
+ {"stat of path failed\n", 1278},
+ {"open of directory failed\n", 1279},
+ {"fork failed\n", 1280},
+ {"exec failed\n", 1281},
+ {"cannot open inittab\n", 1282},
+ {"no TERM or cannot stat tty\n", 1283},
+ {"error stopping service: \"%s\"", 1284},
+ {"too many iov's (change code in wall/ttymsg.c)", 1285},
+ {"excessively long line arg", 1286},
+ {"cannot fork", 1287},
+ {"fork: %s", 1288},
+ {"%s: BAD ERROR", 1289},
+ {"%s: the password file is busy.\n", 1290},
+ {"%s: the group file is busy.\n", 1291},
+ {"%s: the %s file is busy (%s present)\n", 1292},
+ {"%s: can't link %s: %s\n", 1293},
+ {"%s: can't unlock %s: %s (your changes are still in %s)\n", 1294},
+ {"%s: Cannot fork\n", 1295},
+ {"%s: %s unchanged\n", 1296},
+ {"%s: no changes made\n", 1297},
+ {"You are using shadow groups on this system.\n", 1298},
+ {"You are using shadow passwords on this system.\n", 1299},
+ {"Would you like to edit %s now [y/n]? ", 1300},
+ {"usage: %s [file]\n", 1301},
+ {"%s: can't open temporary file.\n", 1302},
+ {"Broadcast Message from %s@%s", 1303},
+ {"%s: will not read %s - use stdin.\n", 1304},
+ {"%s: can't read %s.\n", 1305},
+ {"%s: can't stat temporary file.\n", 1306},
+ {"%s: can't read temporary file.\n", 1307},
+ {"illegal month value: use 1-12", 1308},
+ {"illegal year value: use 1-9999", 1309},
+ {"%s %d", 1310},
+ {"usage: cal [-13smjyV] [[month] year]\n", 1311},
+ {"usage: %s [+format] [day month year]\n", 1312},
+ {"St. Tib's Day", 1313},
+ {"%s: unknown signal %s\n", 1314},
+ {"%s: can't find process \"%s\"\n", 1315},
+ {"%s: unknown signal %s; valid signals:\n", 1316},
+ {"usage: %s [ -s signal | -p ] [ -a ] pid ...\n", 1317},
+ {" %s -l [ signal ]\n", 1318},
+ {"logger: %s: %s.\n", 1319},
+ {"logger: unknown facility name: %s.\n", 1320},
+ {"logger: unknown priority name: %s.\n", 1321},
+ {"\
+usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n", 1322},
+ {"usage: look [-dfa] [-t char] string [file]\n", 1323},
+ {"Could not open %s\n", 1324},
+ {"Got %d bytes from %s\n", 1325},
+ {"namei: unable to get current directory - %s\n", 1326},
+ {"namei: unable to chdir to %s - %s (%d)\n", 1327},
+ {"usage: namei [-mx] pathname [pathname ...]\n", 1328},
+ {"namei: could not chdir to root!\n", 1329},
+ {"namei: could not stat root!\n", 1330},
+ {"namei: buf overflow\n", 1331},
+ {" ? could not chdir into %s - %s (%d)\n", 1332},
+ {" ? problems reading symlink %s - %s (%d)\n", 1333},
+ {" *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n", 1334},
+ {"namei: unknown file type 0%06o on file %s\n", 1335},
+ {"%s: out of memory\n", 1336},
+ {"%s: renaming %s to %s failed: %s\n", 1337},
+ {"call: %s from to files...\n", 1338},
{"\
Warning: `%s' is a link.\n\
Use `%s [options] %s' if you really want to use it.\n\
-Script not started.\n", 1344},
- {"usage: script [-a] [-f] [-q] [-t] [file]\n", 1345},
- {"Script started, file is %s\n", 1346},
- {"Script started on %s", 1347},
+Script not started.\n", 1339},
+ {"usage: script [-a] [-f] [-q] [-t] [file]\n", 1340},
+ {"Script started, file is %s\n", 1341},
+ {"Script started on %s", 1342},
{"\
\n\
-Script done on %s", 1348},
- {"Script done, file is %s\n", 1349},
- {"openpty failed\n", 1350},
- {"Out of pty's\n", 1351},
- {"%s: Argument error, usage\n", 1352},
- {" [ -term terminal_name ]\n", 1353},
- {" [ -reset ]\n", 1354},
- {" [ -initialize ]\n", 1355},
- {" [ -cursor [on|off] ]\n", 1356},
- {" [ -snow [on|off] ]\n", 1357},
- {" [ -softscroll [on|off] ]\n", 1358},
- {" [ -repeat [on|off] ]\n", 1359},
- {" [ -appcursorkeys [on|off] ]\n", 1360},
- {" [ -linewrap [on|off] ]\n", 1361},
- {" [ -default ]\n", 1362},
- {" [ -foreground black|blue|green|cyan", 1363},
- {"|red|magenta|yellow|white|default ]\n", 1364},
- {" [ -background black|blue|green|cyan", 1365},
- {" [ -ulcolor black|grey|blue|green|cyan", 1366},
- {"|red|magenta|yellow|white ]\n", 1367},
- {" [ -ulcolor bright blue|green|cyan", 1368},
- {" [ -hbcolor black|grey|blue|green|cyan", 1369},
- {" [ -hbcolor bright blue|green|cyan", 1370},
- {" [ -standout [ attr ] ]\n", 1371},
- {" [ -inversescreen [on|off] ]\n", 1372},
- {" [ -bold [on|off] ]\n", 1373},
- {" [ -half-bright [on|off] ]\n", 1374},
- {" [ -blink [on|off] ]\n", 1375},
- {" [ -reverse [on|off] ]\n", 1376},
- {" [ -underline [on|off] ]\n", 1377},
- {" [ -store ]\n", 1378},
- {" [ -clear [all|rest] ]\n", 1379},
- {" [ -tabs [ tab1 tab2 tab3 ... ] ] (tabn = 1-160)\n", 1380},
- {" [ -clrtabs [ tab1 tab2 tab3 ... ] ] (tabn = 1-160)\n", 1381},
- {" [ -regtabs [1-160] ]\n", 1382},
- {" [ -blank [0-60] ]\n", 1383},
- {" [ -dump [1-NR_CONSOLES] ]\n", 1384},
- {" [ -append [1-NR_CONSOLES] ]\n", 1385},
- {" [ -file dumpfilename ]\n", 1386},
- {" [ -msg [on|off] ]\n", 1387},
- {" [ -msglevel [0-8] ]\n", 1388},
- {" [ -powersave [on|vsync|hsync|powerdown|off] ]\n", 1389},
- {" [ -powerdown [0-60] ]\n", 1390},
- {" [ -blength [0-2000] ]\n", 1391},
- {" [ -bfreq freqnumber ]\n", 1392},
- {"cannot (un)set powersave mode\n", 1393},
- {"klogctl error: %s\n", 1394},
- {"Error reading %s\n", 1395},
- {"Error writing screendump\n", 1396},
- {"couldn't read %s, and cannot ioctl dump\n", 1397},
- {"%s: $TERM is not defined.\n", 1398},
- {"whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n", 1399},
- {"write: can't find your tty's name\n", 1400},
- {"write: you have write permission turned off.\n", 1401},
- {"write: %s is not logged in on %s.\n", 1402},
- {"write: %s has messages disabled on %s\n", 1403},
- {"usage: write user [tty]\n", 1404},
- {"write: %s is not logged in\n", 1405},
- {"write: %s has messages disabled\n", 1406},
- {"write: %s is logged in more than once; writing to %s\n", 1407},
- {"Message from %s@%s (as %s) on %s at %s ...", 1408},
- {"Message from %s@%s on %s at %s ...", 1409},
- {"warning: error reading %s: %s", 1410},
- {"warning: can't open %s: %s", 1411},
- {"mount: could not open %s - using %s instead\n", 1412},
- {"can't create lock file %s: %s (use -n flag to override)", 1413},
- {"can't link lock file %s: %s (use -n flag to override)", 1414},
- {"can't open lock file %s: %s (use -n flag to override)", 1415},
- {"Can't lock lock file %s: %s\n", 1416},
- {"can't lock lock file %s: %s", 1417},
- {"timed out", 1418},
+Script done on %s", 1343},
+ {"Script done, file is %s\n", 1344},
+ {"openpty failed\n", 1345},
+ {"Out of pty's\n", 1346},
+ {"%s: Argument error, usage\n", 1347},
+ {" [ -term terminal_name ]\n", 1348},
+ {" [ -reset ]\n", 1349},
+ {" [ -initialize ]\n", 1350},
+ {" [ -cursor [on|off] ]\n", 1351},
+ {" [ -snow [on|off] ]\n", 1352},
+ {" [ -softscroll [on|off] ]\n", 1353},
+ {" [ -repeat [on|off] ]\n", 1354},
+ {" [ -appcursorkeys [on|off] ]\n", 1355},
+ {" [ -linewrap [on|off] ]\n", 1356},
+ {" [ -default ]\n", 1357},
+ {" [ -foreground black|blue|green|cyan", 1358},
+ {"|red|magenta|yellow|white|default ]\n", 1359},
+ {" [ -background black|blue|green|cyan", 1360},
+ {" [ -ulcolor black|grey|blue|green|cyan", 1361},
+ {"|red|magenta|yellow|white ]\n", 1362},
+ {" [ -ulcolor bright blue|green|cyan", 1363},
+ {" [ -hbcolor black|grey|blue|green|cyan", 1364},
+ {" [ -hbcolor bright blue|green|cyan", 1365},
+ {" [ -standout [ attr ] ]\n", 1366},
+ {" [ -inversescreen [on|off] ]\n", 1367},
+ {" [ -bold [on|off] ]\n", 1368},
+ {" [ -half-bright [on|off] ]\n", 1369},
+ {" [ -blink [on|off] ]\n", 1370},
+ {" [ -reverse [on|off] ]\n", 1371},
+ {" [ -underline [on|off] ]\n", 1372},
+ {" [ -store ]\n", 1373},
+ {" [ -clear [all|rest] ]\n", 1374},
+ {" [ -tabs [ tab1 tab2 tab3 ... ] ] (tabn = 1-160)\n", 1375},
+ {" [ -clrtabs [ tab1 tab2 tab3 ... ] ] (tabn = 1-160)\n", 1376},
+ {" [ -regtabs [1-160] ]\n", 1377},
+ {" [ -blank [0-60] ]\n", 1378},
+ {" [ -dump [1-NR_CONSOLES] ]\n", 1379},
+ {" [ -append [1-NR_CONSOLES] ]\n", 1380},
+ {" [ -file dumpfilename ]\n", 1381},
+ {" [ -msg [on|off] ]\n", 1382},
+ {" [ -msglevel [0-8] ]\n", 1383},
+ {" [ -powersave [on|vsync|hsync|powerdown|off] ]\n", 1384},
+ {" [ -powerdown [0-60] ]\n", 1385},
+ {" [ -blength [0-2000] ]\n", 1386},
+ {" [ -bfreq freqnumber ]\n", 1387},
+ {"cannot (un)set powersave mode\n", 1388},
+ {"klogctl error: %s\n", 1389},
+ {"Error reading %s\n", 1390},
+ {"Error writing screendump\n", 1391},
+ {"couldn't read %s, and cannot ioctl dump\n", 1392},
+ {"%s: $TERM is not defined.\n", 1393},
+ {"whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n", 1394},
+ {"write: can't find your tty's name\n", 1395},
+ {"write: you have write permission turned off.\n", 1396},
+ {"write: %s is not logged in on %s.\n", 1397},
+ {"write: %s has messages disabled on %s\n", 1398},
+ {"usage: write user [tty]\n", 1399},
+ {"write: %s is not logged in\n", 1400},
+ {"write: %s has messages disabled\n", 1401},
+ {"write: %s is logged in more than once; writing to %s\n", 1402},
+ {"Message from %s@%s (as %s) on %s at %s ...", 1403},
+ {"Message from %s@%s on %s at %s ...", 1404},
+ {"warning: error reading %s: %s", 1405},
+ {"warning: can't open %s: %s", 1406},
+ {"mount: could not open %s - using %s instead\n", 1407},
+ {"can't create lock file %s: %s (use -n flag to override)", 1408},
+ {"can't link lock file %s: %s (use -n flag to override)", 1409},
+ {"can't open lock file %s: %s (use -n flag to override)", 1410},
+ {"Can't lock lock file %s: %s\n", 1411},
+ {"can't lock lock file %s: %s", 1412},
+ {"timed out", 1413},
{"\
Cannot create link %s\n\
-Perhaps there is a stale lock file?\n", 1419},
- {"cannot open %s (%s) - mtab not updated", 1420},
- {"error writing %s: %s", 1421},
- {"error changing mode of %s: %s\n", 1422},
- {"can't rename %s to %s: %s\n", 1423},
- {"loop: can't open device %s: %s\n", 1424},
- {"loop: can't get info on device %s: %s\n", 1425},
- {"%s: [%04x]:%ld (%s) offset %d, %s encryption\n", 1426},
- {"mount: could not find any device /dev/loop#", 1427},
+Perhaps there is a stale lock file?\n", 1414},
+ {"cannot open %s (%s) - mtab not updated", 1415},
+ {"error writing %s: %s", 1416},
+ {"error changing mode of %s: %s\n", 1417},
+ {"can't rename %s to %s: %s\n", 1418},
+ {"loop: can't open device %s: %s\n", 1419},
+ {"loop: can't get info on device %s: %s\n", 1420},
+ {"%s: [%04x]:%ld (%s) offset %d, %s encryption\n", 1421},
+ {"mount: could not find any device /dev/loop#", 1422},
{"\
mount: Could not find any loop device.\n\
- Maybe /dev/loop# has a wrong major number?", 1428},
+ Maybe /dev/loop# has a wrong major number?", 1423},
{"\
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'.)", 1429},
+ (If so, then recompile or `insmod loop.o'.)", 1424},
{"\
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?", 1430},
- {"mount: could not find any free loop device", 1431},
- {"Unsupported encryption type %s\n", 1432},
- {"Couldn't lock into memory, exiting.\n", 1433},
- {"Init (up to 16 hex digits): ", 1434},
- {"Non-hex digit '%c'.\n", 1435},
- {"Don't know how to get key for encryption system %d\n", 1436},
- {"set_loop(%s,%s,%d): success\n", 1437},
- {"loop: can't delete device %s: %s\n", 1438},
- {"del_loop(%s): success\n", 1439},
- {"This mount was compiled without loop support. Please recompile.\n", 1440},
+ maybe /dev/loop# has the wrong major number?", 1425},
+ {"mount: could not find any free loop device", 1426},
+ {"Unsupported encryption type %s\n", 1427},
+ {"Couldn't lock into memory, exiting.\n", 1428},
+ {"Init (up to 16 hex digits): ", 1429},
+ {"Non-hex digit '%c'.\n", 1430},
+ {"Don't know how to get key for encryption system %d\n", 1431},
+ {"set_loop(%s,%s,%d): success\n", 1432},
+ {"loop: can't delete device %s: %s\n", 1433},
+ {"del_loop(%s): success\n", 1434},
+ {"This mount was compiled without loop support. Please recompile.\n", 1435},
{"\
usage:\n\
%s loop_device # give info\n\
%s -d loop_device # delete\n\
- %s [ -e encryption ] [ -o offset ] loop_device file # setup\n", 1441},
- {"not enough memory", 1442},
- {"No loop support was available at compile time. Please recompile.\n", 1443},
- {"[mntent]: warning: no final newline at the end of %s\n", 1444},
- {"[mntent]: line %d in %s is bad%s\n", 1445},
- {"; rest of file ignored", 1446},
- {"mount: according to mtab, %s is already mounted on %s", 1447},
- {"mount: according to mtab, %s is mounted on %s", 1448},
- {"mount: can't open %s for writing: %s", 1449},
- {"mount: error writing %s: %s", 1450},
- {"mount: error changing mode of %s: %s", 1451},
- {"%s looks like swapspace - not mounted", 1452},
- {"mount failed", 1453},
- {"mount: only root can mount %s on %s", 1454},
- {"mount: loop device specified twice", 1455},
- {"mount: type specified twice", 1456},
- {"mount: skipping the setup of a loop device\n", 1457},
- {"mount: going to use the loop device %s\n", 1458},
- {"mount: failed setting up loop device\n", 1459},
- {"mount: setup loop device successfully\n", 1460},
- {"mount: can't open %s: %s", 1461},
- {"mount: cannot open %s for setting speed", 1462},
- {"mount: cannot set speed: %s", 1463},
- {"mount: cannot fork: %s", 1464},
- {"mount: this version was compiled without support for the type `nfs'", 1465},
- {"mount: failed with nfs mount version 4, trying 3..\n", 1466},
- {"\
-mount: I could not determine the filesystem type, and none was specified", 1467},
- {"mount: you must specify the filesystem type", 1468},
- {"mount: mount failed", 1469},
- {"mount: mount point %s is not a directory", 1470},
- {"mount: permission denied", 1471},
- {"mount: must be superuser to use mount", 1472},
- {"mount: %s is busy", 1473},
- {"mount: proc already mounted", 1474},
- {"mount: %s already mounted or %s busy", 1475},
- {"mount: mount point %s does not exist", 1476},
- {"mount: mount point %s is a symbolic link to nowhere", 1477},
- {"mount: special device %s does not exist", 1478},
+ %s [ -e encryption ] [ -o offset ] loop_device file # setup\n", 1436},
+ {"not enough memory", 1437},
+ {"No loop support was available at compile time. Please recompile.\n", 1438},
+ {"[mntent]: warning: no final newline at the end of %s\n", 1439},
+ {"[mntent]: line %d in %s is bad%s\n", 1440},
+ {"; rest of file ignored", 1441},
+ {"mount: according to mtab, %s is already mounted on %s", 1442},
+ {"mount: according to mtab, %s is mounted on %s", 1443},
+ {"mount: can't open %s for writing: %s", 1444},
+ {"mount: error writing %s: %s", 1445},
+ {"mount: error changing mode of %s: %s", 1446},
+ {"%s looks like swapspace - not mounted", 1447},
+ {"mount failed", 1448},
+ {"mount: only root can mount %s on %s", 1449},
+ {"mount: loop device specified twice", 1450},
+ {"mount: type specified twice", 1451},
+ {"mount: skipping the setup of a loop device\n", 1452},
+ {"mount: going to use the loop device %s\n", 1453},
+ {"mount: failed setting up loop device\n", 1454},
+ {"mount: setup loop device successfully\n", 1455},
+ {"mount: can't open %s: %s", 1456},
+ {"mount: cannot open %s for setting speed", 1457},
+ {"mount: cannot set speed: %s", 1458},
+ {"mount: cannot fork: %s", 1459},
+ {"mount: this version was compiled without support for the type `nfs'", 1460},
+ {"mount: failed with nfs mount version 4, trying 3..\n", 1461},
+ {"\
+mount: I could not determine the filesystem type, and none was specified", 1462},
+ {"mount: you must specify the filesystem type", 1463},
+ {"mount: mount failed", 1464},
+ {"mount: mount point %s is not a directory", 1465},
+ {"mount: permission denied", 1466},
+ {"mount: must be superuser to use mount", 1467},
+ {"mount: %s is busy", 1468},
+ {"mount: proc already mounted", 1469},
+ {"mount: %s already mounted or %s busy", 1470},
+ {"mount: mount point %s does not exist", 1471},
+ {"mount: mount point %s is a symbolic link to nowhere", 1472},
+ {"mount: special device %s does not exist", 1473},
{"\
mount: special device %s does not exist\n\
- (a path prefix is not a directory)\n", 1479},
- {"mount: %s not mounted already, or bad option", 1480},
+ (a path prefix is not a directory)\n", 1474},
+ {"mount: %s not mounted already, or bad option", 1475},
{"\
mount: wrong fs type, bad option, bad superblock on %s,\n\
- or too many mounted file systems", 1481},
- {"mount table full", 1482},
- {"mount: %s: can't read superblock", 1483},
- {"mount: %s: unknown device", 1484},
- {"mount: fs type %s not supported by kernel", 1485},
- {"mount: probably you meant %s", 1486},
- {"mount: maybe you meant iso9660 ?", 1487},
- {"mount: %s has wrong device number or fs type %s not supported", 1488},
- {"mount: %s is not a block device, and stat fails?", 1489},
+ or too many mounted file systems", 1476},
+ {"mount table full", 1477},
+ {"mount: %s: can't read superblock", 1478},
+ {"mount: %s: unknown device", 1479},
+ {"mount: fs type %s not supported by kernel", 1480},
+ {"mount: probably you meant %s", 1481},
+ {"mount: maybe you meant iso9660 ?", 1482},
+ {"mount: %s has wrong device number or fs type %s not supported", 1483},
+ {"mount: %s is not a block device, and stat fails?", 1484},
{"\
mount: the kernel does not recognize %s as a block device\n\
- (maybe `insmod driver'?)", 1490},
- {"mount: %s is not a block device (maybe try `-o loop'?)", 1491},
- {"mount: %s is not a block device", 1492},
- {"mount: %s is not a valid block device", 1493},
- {"block device ", 1494},
- {"mount: cannot mount %s%s read-only", 1495},
- {"mount: %s%s is write-protected but explicit `-w' flag given", 1496},
- {"mount: %s%s is write-protected, mounting read-only", 1497},
- {"mount: the label %s occurs on both %s and %s\n", 1498},
- {"mount: %s duplicate - not mounted", 1499},
- {"mount: going to mount %s by %s\n", 1500},
- {"UUID", 1501},
- {"label", 1502},
- {"mount: no such partition found", 1503},
- {"mount: no type was given - I'll assume nfs because of the colon\n", 1504},
- {"mount: backgrounding \"%s\"\n", 1505},
- {"mount: giving up \"%s\"\n", 1506},
- {"mount: %s already mounted on %s\n", 1507},
+ (maybe `insmod driver'?)", 1485},
+ {"mount: %s is not a block device (maybe try `-o loop'?)", 1486},
+ {"mount: %s is not a block device", 1487},
+ {"mount: %s is not a valid block device", 1488},
+ {"block device ", 1489},
+ {"mount: cannot mount %s%s read-only", 1490},
+ {"mount: %s%s is write-protected but explicit `-w' flag given", 1491},
+ {"mount: %s%s is write-protected, mounting read-only", 1492},
+ {"mount: the label %s occurs on both %s and %s\n", 1493},
+ {"mount: %s duplicate - not mounted", 1494},
+ {"mount: going to mount %s by %s\n", 1495},
+ {"UUID", 1496},
+ {"label", 1497},
+ {"mount: no such partition found", 1498},
+ {"mount: no type was given - I'll assume nfs because of the colon\n", 1499},
+ {"mount: no type was given - I'll assume smb because of the // prefix\n", 1500},
+ {"mount: backgrounding \"%s\"\n", 1501},
+ {"mount: giving up \"%s\"\n", 1502},
+ {"mount: %s already mounted on %s\n", 1503},
{"\
Usage: mount -V : print version\n\
mount -h : print this help\n\
@@ -1984,285 +1980,289 @@ or move a subtree:\n\
A device can be given by name, say /dev/hda1 or /dev/cdrom,\n\
or by label, using -L label or by uuid, using -U uuid .\n\
Other options: [-nfFrsvw] [-o options].\n\
-For many more details, say man 8 mount .\n", 1508},
- {"mount: only root can do that", 1509},
- {"mount: no %s found - creating it..\n", 1510},
- {"mount: the label %s occurs on both %s and %s - not mounted\n", 1511},
- {"mount: mounting %s\n", 1512},
- {"nothing was mounted", 1513},
- {"mount: cannot find %s in %s", 1514},
- {"mount: can't find %s in %s or %s", 1515},
- {"\
-mount: could not open %s, so UUID and LABEL conversion cannot be done.\n", 1516},
- {"mount: bad UUID", 1517},
- {"mount: error while guessing filesystem type\n", 1518},
- {"mount: you didn't specify a filesystem type for %s\n", 1519},
- {" I will try all types mentioned in %s or %s\n", 1520},
- {" and it looks like this is swapspace\n", 1521},
- {" I will try type %s\n", 1522},
- {"Trying %s\n", 1523},
- {"mount: excessively long host:dir argument\n", 1524},
- {"mount: warning: multiple hostnames not supported\n", 1525},
- {"mount: directory to mount not in host:dir format\n", 1526},
- {"mount: can't get address for %s\n", 1527},
- {"mount: got bad hp->h_length\n", 1528},
- {"mount: excessively long option argument\n", 1529},
- {"Warning: Unrecognized proto= option.\n", 1530},
- {"Warning: Option namlen is not supported.\n", 1531},
- {"unknown nfs mount parameter: %s=%d\n", 1532},
- {"Warning: option nolock is not supported.\n", 1533},
- {"unknown nfs mount option: %s%s\n", 1534},
- {"mount: got bad hp->h_length?\n", 1535},
- {"NFS over TCP is not supported.\n", 1536},
- {"nfs socket", 1537},
- {"nfs bindresvport", 1538},
- {"nfs server reported service unavailable", 1539},
- {"used portmapper to find NFS port\n", 1540},
- {"using port %d for nfs deamon\n", 1541},
- {"nfs connect", 1542},
- {"unknown nfs status return value: %d", 1543},
- {"bug in xstrndup call", 1544},
+For many more details, say man 8 mount .\n", 1504},
+ {"mount: only root can do that", 1505},
+ {"mount: no %s found - creating it..\n", 1506},
+ {"mount: the label %s occurs on both %s and %s - not mounted\n", 1507},
+ {"mount: mounting %s\n", 1508},
+ {"nothing was mounted", 1509},
+ {"mount: cannot find %s in %s", 1510},
+ {"mount: can't find %s in %s or %s", 1511},
+ {"\
+mount: could not open %s, so UUID and LABEL conversion cannot be done.\n", 1512},
+ {"mount: bad UUID", 1513},
+ {"mount: error while guessing filesystem type\n", 1514},
+ {"mount: you didn't specify a filesystem type for %s\n", 1515},
+ {" I will try all types mentioned in %s or %s\n", 1516},
+ {" and it looks like this is swapspace\n", 1517},
+ {" I will try type %s\n", 1518},
+ {"Trying %s\n", 1519},
+ {"mount: excessively long host:dir argument\n", 1520},
+ {"mount: warning: multiple hostnames not supported\n", 1521},
+ {"mount: directory to mount not in host:dir format\n", 1522},
+ {"mount: can't get address for %s\n", 1523},
+ {"mount: got bad hp->h_length\n", 1524},
+ {"mount: excessively long option argument\n", 1525},
+ {"Warning: Unrecognized proto= option.\n", 1526},
+ {"Warning: Option namlen is not supported.\n", 1527},
+ {"unknown nfs mount parameter: %s=%d\n", 1528},
+ {"Warning: option nolock is not supported.\n", 1529},
+ {"unknown nfs mount option: %s%s\n", 1530},
+ {"mount: got bad hp->h_length?\n", 1531},
+ {"NFS over TCP is not supported.\n", 1532},
+ {"nfs socket", 1533},
+ {"nfs bindresvport", 1534},
+ {"nfs server reported service unavailable", 1535},
+ {"used portmapper to find NFS port\n", 1536},
+ {"using port %d for nfs deamon\n", 1537},
+ {"nfs connect", 1538},
+ {"unknown nfs status return value: %d", 1539},
+ {"bug in xstrndup call", 1540},
{"\
usage: %s [-hV]\n\
%s -a [-v]\n\
%s [-v] [-p priority] special ...\n\
- %s [-s]\n", 1545},
- {"%s on %s\n", 1546},
- {"swapon: cannot stat %s: %s\n", 1547},
- {"swapon: warning: %s has insecure permissions %04o, %04o suggested\n", 1548},
- {"swapon: Skipping file %s - it appears to have holes.\n", 1549},
- {"%s: cannot open %s: %s\n", 1550},
- {"umount: compiled without support for -f\n", 1551},
- {"host: %s, directory: %s\n", 1552},
- {"umount: can't get address for %s\n", 1553},
- {"umount: got bad hostp->h_length\n", 1554},
- {"umount: %s: invalid block device", 1555},
- {"umount: %s: not mounted", 1556},
- {"umount: %s: can't write superblock", 1557},
- {"umount: %s: device is busy", 1558},
- {"umount: %s: not found", 1559},
- {"umount: %s: must be superuser to umount", 1560},
- {"umount: %s: block devices not permitted on fs", 1561},
- {"umount: %s: %s", 1562},
- {"no umount2, trying umount...\n", 1563},
- {"could not umount %s - trying %s instead\n", 1564},
- {"umount: %s busy - remounted read-only\n", 1565},
- {"umount: could not remount %s read-only\n", 1566},
- {"%s umounted\n", 1567},
- {"umount: cannot find list of filesystems to unmount", 1568},
+ %s [-s]\n", 1541},
+ {"\
+usage: %s [-hV]\n\
+ %s -a [-v]\n\
+ %s [-v] special ...\n", 1542},
+ {"%s on %s\n", 1543},
+ {"swapon: cannot stat %s: %s\n", 1544},
+ {"swapon: warning: %s has insecure permissions %04o, %04o suggested\n", 1545},
+ {"swapon: Skipping file %s - it appears to have holes.\n", 1546},
+ {"Not superuser.\n", 1547},
+ {"%s: cannot open %s: %s\n", 1548},
+ {"umount: compiled without support for -f\n", 1549},
+ {"host: %s, directory: %s\n", 1550},
+ {"umount: can't get address for %s\n", 1551},
+ {"umount: got bad hostp->h_length\n", 1552},
+ {"umount: %s: invalid block device", 1553},
+ {"umount: %s: not mounted", 1554},
+ {"umount: %s: can't write superblock", 1555},
+ {"umount: %s: device is busy", 1556},
+ {"umount: %s: not found", 1557},
+ {"umount: %s: must be superuser to umount", 1558},
+ {"umount: %s: block devices not permitted on fs", 1559},
+ {"umount: %s: %s", 1560},
+ {"no umount2, trying umount...\n", 1561},
+ {"could not umount %s - trying %s instead\n", 1562},
+ {"umount: %s busy - remounted read-only\n", 1563},
+ {"umount: could not remount %s read-only\n", 1564},
+ {"%s umounted\n", 1565},
+ {"umount: cannot find list of filesystems to unmount", 1566},
{"\
Usage: umount [-hV]\n\
umount -a [-f] [-r] [-n] [-v] [-t vfstypes]\n\
- umount [-f] [-r] [-n] [-v] special | node...\n", 1569},
- {"Trying to umount %s\n", 1570},
- {"Could not find %s in mtab\n", 1571},
- {"umount: %s is not mounted (according to mtab)", 1572},
- {"umount: it seems %s is mounted multiple times", 1573},
- {"umount: %s is not in the fstab (and you are not root)", 1574},
- {"umount: %s mount disagrees with the fstab", 1575},
- {"umount: only root can unmount %s from %s", 1576},
- {"umount: only root can do that", 1577},
- {"You must be root to set the Ctrl-Alt-Del behaviour.\n", 1578},
- {"Usage: ctrlaltdel hard|soft\n", 1579},
+ umount [-f] [-r] [-n] [-v] special | node...\n", 1567},
+ {"Trying to umount %s\n", 1568},
+ {"Could not find %s in mtab\n", 1569},
+ {"umount: %s is not mounted (according to mtab)", 1570},
+ {"umount: it seems %s is mounted multiple times", 1571},
+ {"umount: %s is not in the fstab (and you are not root)", 1572},
+ {"umount: %s mount disagrees with the fstab", 1573},
+ {"umount: only root can unmount %s from %s", 1574},
+ {"umount: only root can do that", 1575},
+ {"You must be root to set the Ctrl-Alt-Del behaviour.\n", 1576},
+ {"Usage: ctrlaltdel hard|soft\n", 1577},
{"\
File %s, For threshold value %lu, Maximum characters in fifo were %d,\n\
-and the maximum transfer rate in characters/second was %f\n", 1580},
+and the maximum transfer rate in characters/second was %f\n", 1578},
{"\
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", 1581},
- {"Invalid interval value: %s\n", 1582},
- {"Invalid set value: %s\n", 1583},
- {"Invalid default value: %s\n", 1584},
- {"Invalid set time value: %s\n", 1585},
- {"Invalid default time value: %s\n", 1586},
+and the maximum transfer rate in characters/second was %f\n", 1579},
+ {"Invalid interval value: %s\n", 1580},
+ {"Invalid set value: %s\n", 1581},
+ {"Invalid default value: %s\n", 1582},
+ {"Invalid set time value: %s\n", 1583},
+ {"Invalid default time value: %s\n", 1584},
{"\
Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) \
-[-g|-G] file [file...]\n", 1587},
- {"Can't open %s: %s\n", 1588},
- {"Can't set %s to threshold %d: %s\n", 1589},
- {"Can't set %s to time threshold %d: %s\n", 1590},
- {"Can't get threshold for %s: %s\n", 1591},
- {"Can't get timeout for %s: %s\n", 1592},
- {"%s: %ld current threshold and %ld current timeout\n", 1593},
- {"%s: %ld default threshold and %ld default timeout\n", 1594},
- {"Can't set signal handler", 1595},
- {"gettimeofday failed", 1596},
- {"Can't issue CYGETMON on %s: %s\n", 1597},
- {"\
-%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n", 1598},
- {" %f int/sec; %f rec, %f send (char/sec)\n", 1599},
- {"\
-%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n", 1600},
- {" %f int/sec; %f rec (char/sec)\n", 1601},
- {"Usage: %s [-c] [-n level] [-s bufsize]\n", 1602},
- {"invalid id: %s\n", 1603},
- {"cannot remove id %s (%s)\n", 1604},
- {"deprecated usage: %s {shm | msg | sem} id ...\n", 1605},
- {"unknown resource type: %s\n", 1606},
- {"resource(s) deleted\n", 1607},
+[-g|-G] file [file...]\n", 1585},
+ {"Can't open %s: %s\n", 1586},
+ {"Can't set %s to threshold %d: %s\n", 1587},
+ {"Can't set %s to time threshold %d: %s\n", 1588},
+ {"Can't get threshold for %s: %s\n", 1589},
+ {"Can't get timeout for %s: %s\n", 1590},
+ {"%s: %ld current threshold and %ld current timeout\n", 1591},
+ {"%s: %ld default threshold and %ld default timeout\n", 1592},
+ {"Can't set signal handler", 1593},
+ {"gettimeofday failed", 1594},
+ {"Can't issue CYGETMON on %s: %s\n", 1595},
+ {"\
+%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n", 1596},
+ {" %f int/sec; %f rec, %f send (char/sec)\n", 1597},
+ {"\
+%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n", 1598},
+ {" %f int/sec; %f rec (char/sec)\n", 1599},
+ {"Usage: %s [-c] [-n level] [-s bufsize]\n", 1600},
+ {"invalid id: %s\n", 1601},
+ {"cannot remove id %s (%s)\n", 1602},
+ {"deprecated usage: %s {shm | msg | sem} id ...\n", 1603},
+ {"unknown resource type: %s\n", 1604},
+ {"resource(s) deleted\n", 1605},
{"\
usage: %s [ [-q msqid] [-m shmid] [-s semid]\n\
- [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n", 1608},
- {"%s: illegal option -- %c\n", 1609},
- {"%s: illegal key (%s)\n", 1610},
- {"permission denied for key", 1611},
- {"already removed key", 1612},
- {"invalid key", 1613},
- {"unknown error in key", 1614},
- {"permission denied for id", 1615},
- {"invalid id", 1616},
- {"already removed id", 1617},
- {"unknown error in id", 1618},
- {"%s: %s (%s)\n", 1619},
- {"%s: unknown argument: %s\n", 1620},
- {"usage : %s -asmq -tclup \n", 1621},
- {"\t%s [-s -m -q] -i id\n", 1622},
- {"\t%s -h for help.\n", 1623},
- {"\
-%s provides information on ipc facilities for which you have read access.\n", 1624},
+ [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n", 1606},
+ {"%s: illegal option -- %c\n", 1607},
+ {"%s: illegal key (%s)\n", 1608},
+ {"permission denied for key", 1609},
+ {"already removed key", 1610},
+ {"invalid key", 1611},
+ {"unknown error in key", 1612},
+ {"permission denied for id", 1613},
+ {"invalid id", 1614},
+ {"already removed id", 1615},
+ {"unknown error in id", 1616},
+ {"%s: %s (%s)\n", 1617},
+ {"%s: unknown argument: %s\n", 1618},
+ {"usage : %s -asmq -tclup \n", 1619},
+ {"\t%s [-s -m -q] -i id\n", 1620},
+ {"\t%s -h for help.\n", 1621},
+ {"\
+%s provides information on ipc facilities for which you have read access.\n", 1622},
{"\
Resource Specification:\n\
\t-m : shared_mem\n\
-\t-q : messages\n", 1625},
+\t-q : messages\n", 1623},
{"\
\t-s : semaphores\n\
-\t-a : all (default)\n", 1626},
+\t-a : all (default)\n", 1624},
{"\
Output Format:\n\
\t-t : time\n\
\t-p : pid\n\
-\t-c : creator\n", 1627},
+\t-c : creator\n", 1625},
{"\
\t-l : limits\n\
-\t-u : summary\n", 1628},
- {"-i id [-s -q -m] : details on resource identified by id\n", 1629},
- {"kernel not configured for shared memory\n", 1630},
- {"------ Shared Memory Limits --------\n", 1631},
- {"max number of segments = %ld\n", 1632},
- {"max seg size (kbytes) = %ld\n", 1633},
- {"max total shared memory (kbytes) = %ld\n", 1634},
- {"min seg size (bytes) = %ld\n", 1635},
- {"------ Shared Memory Status --------\n", 1636},
- {"segments allocated %d\n", 1637},
- {"pages allocated %ld\n", 1638},
- {"pages resident %ld\n", 1639},
- {"pages swapped %ld\n", 1640},
- {"Swap performance: %ld attempts\t %ld successes\n", 1641},
- {"------ Shared Memory Segment Creators/Owners --------\n", 1642},
- {"%-10s %-10s %-10s %-10s %-10s %-10s\n", 1643},
- {"shmid", 1644},
- {"perms", 1645},
- {"cuid", 1646},
- {"cgid", 1647},
- {"uid", 1648},
- {"gid", 1649},
- {"------ Shared Memory Attach/Detach/Change Times --------\n", 1650},
- {"%-10s %-10s %-20s %-20s %-20s\n", 1651},
- {"owner", 1652},
- {"attached", 1653},
- {"detached", 1654},
- {"changed", 1655},
- {"------ Shared Memory Creator/Last-op --------\n", 1656},
- {"%-10s %-10s %-10s %-10s\n", 1657},
- {"cpid", 1658},
- {"lpid", 1659},
- {"------ Shared Memory Segments --------\n", 1660},
- {"%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n", 1661},
- {"key", 1662},
- {"bytes", 1663},
- {"nattch", 1664},
- {"status", 1665},
- {"Not set", 1666},
- {"dest", 1667},
- {"locked", 1668},
- {"kernel not configured for semaphores\n", 1669},
- {"------ Semaphore Limits --------\n", 1670},
- {"max number of arrays = %d\n", 1671},
- {"max semaphores per array = %d\n", 1672},
- {"max semaphores system wide = %d\n", 1673},
- {"max ops per semop call = %d\n", 1674},
- {"semaphore max value = %d\n", 1675},
- {"------ Semaphore Status --------\n", 1676},
- {"used arrays = %d\n", 1677},
- {"allocated semaphores = %d\n", 1678},
- {"------ Semaphore Arrays Creators/Owners --------\n", 1679},
- {"semid", 1680},
- {"------ Shared Memory Operation/Change Times --------\n", 1681},
- {"%-8s %-10s %-26.24s %-26.24s\n", 1682},
- {"last-op", 1683},
- {"last-changed", 1684},
- {"------ Semaphore Arrays --------\n", 1685},
- {"%-10s %-10s %-10s %-10s %-10s %-12s\n", 1686},
- {"nsems", 1687},
- {"kernel not configured for message queues\n", 1688},
- {"------ Messages: Limits --------\n", 1689},
- {"max queues system wide = %d\n", 1690},
- {"max size of message (bytes) = %d\n", 1691},
- {"default max size of queue (bytes) = %d\n", 1692},
- {"------ Messages: Status --------\n", 1693},
- {"allocated queues = %d\n", 1694},
- {"used headers = %d\n", 1695},
- {"used space = %d bytes\n", 1696},
- {"------ Message Queues: Creators/Owners --------\n", 1697},
- {"msqid", 1698},
- {"------ Message Queues Send/Recv/Change Times --------\n", 1699},
- {"%-8s %-10s %-20s %-20s %-20s\n", 1700},
- {"send", 1701},
- {"recv", 1702},
- {"change", 1703},
- {"------ Message Queues PIDs --------\n", 1704},
- {"lspid", 1705},
- {"lrpid", 1706},
- {"------ Message Queues --------\n", 1707},
- {"%-10s %-10s %-10s %-10s %-12s %-12s\n", 1708},
- {"used-bytes", 1709},
- {"messages", 1710},
+\t-u : summary\n", 1626},
+ {"-i id [-s -q -m] : details on resource identified by id\n", 1627},
+ {"kernel not configured for shared memory\n", 1628},
+ {"------ Shared Memory Limits --------\n", 1629},
+ {"max number of segments = %ld\n", 1630},
+ {"max seg size (kbytes) = %ld\n", 1631},
+ {"max total shared memory (kbytes) = %ld\n", 1632},
+ {"min seg size (bytes) = %ld\n", 1633},
+ {"------ Shared Memory Status --------\n", 1634},
+ {"segments allocated %d\n", 1635},
+ {"pages allocated %ld\n", 1636},
+ {"pages resident %ld\n", 1637},
+ {"pages swapped %ld\n", 1638},
+ {"Swap performance: %ld attempts\t %ld successes\n", 1639},
+ {"------ Shared Memory Segment Creators/Owners --------\n", 1640},
+ {"%-10s %-10s %-10s %-10s %-10s %-10s\n", 1641},
+ {"shmid", 1642},
+ {"perms", 1643},
+ {"cuid", 1644},
+ {"cgid", 1645},
+ {"uid", 1646},
+ {"gid", 1647},
+ {"------ Shared Memory Attach/Detach/Change Times --------\n", 1648},
+ {"%-10s %-10s %-20s %-20s %-20s\n", 1649},
+ {"owner", 1650},
+ {"attached", 1651},
+ {"detached", 1652},
+ {"changed", 1653},
+ {"------ Shared Memory Creator/Last-op --------\n", 1654},
+ {"%-10s %-10s %-10s %-10s\n", 1655},
+ {"cpid", 1656},
+ {"lpid", 1657},
+ {"------ Shared Memory Segments --------\n", 1658},
+ {"%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n", 1659},
+ {"key", 1660},
+ {"bytes", 1661},
+ {"nattch", 1662},
+ {"status", 1663},
+ {"Not set", 1664},
+ {"dest", 1665},
+ {"locked", 1666},
+ {"kernel not configured for semaphores\n", 1667},
+ {"------ Semaphore Limits --------\n", 1668},
+ {"max number of arrays = %d\n", 1669},
+ {"max semaphores per array = %d\n", 1670},
+ {"max semaphores system wide = %d\n", 1671},
+ {"max ops per semop call = %d\n", 1672},
+ {"semaphore max value = %d\n", 1673},
+ {"------ Semaphore Status --------\n", 1674},
+ {"used arrays = %d\n", 1675},
+ {"allocated semaphores = %d\n", 1676},
+ {"------ Semaphore Arrays Creators/Owners --------\n", 1677},
+ {"semid", 1678},
+ {"------ Shared Memory Operation/Change Times --------\n", 1679},
+ {"%-8s %-10s %-26.24s %-26.24s\n", 1680},
+ {"last-op", 1681},
+ {"last-changed", 1682},
+ {"------ Semaphore Arrays --------\n", 1683},
+ {"%-10s %-10s %-10s %-10s %-10s\n", 1684},
+ {"nsems", 1685},
+ {"kernel not configured for message queues\n", 1686},
+ {"------ Messages: Limits --------\n", 1687},
+ {"max queues system wide = %d\n", 1688},
+ {"max size of message (bytes) = %d\n", 1689},
+ {"default max size of queue (bytes) = %d\n", 1690},
+ {"------ Messages: Status --------\n", 1691},
+ {"allocated queues = %d\n", 1692},
+ {"used headers = %d\n", 1693},
+ {"used space = %d bytes\n", 1694},
+ {"------ Message Queues: Creators/Owners --------\n", 1695},
+ {"msqid", 1696},
+ {"------ Message Queues Send/Recv/Change Times --------\n", 1697},
+ {"%-8s %-10s %-20s %-20s %-20s\n", 1698},
+ {"send", 1699},
+ {"recv", 1700},
+ {"change", 1701},
+ {"------ Message Queues PIDs --------\n", 1702},
+ {"lspid", 1703},
+ {"lrpid", 1704},
+ {"------ Message Queues --------\n", 1705},
+ {"%-10s %-10s %-10s %-10s %-12s %-12s\n", 1706},
+ {"used-bytes", 1707},
+ {"messages", 1708},
{"\
\n\
-Shared memory Segment shmid=%d\n", 1711},
- {"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n", 1712},
- {"mode=%#o\taccess_perms=%#o\n", 1713},
- {"bytes=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n", 1714},
- {"att_time=%-26.24s\n", 1715},
- {"det_time=%-26.24s\n", 1716},
- {"change_time=%-26.24s\n", 1717},
+Shared memory Segment shmid=%d\n", 1709},
+ {"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n", 1710},
+ {"mode=%#o\taccess_perms=%#o\n", 1711},
+ {"bytes=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n", 1712},
+ {"att_time=%-26.24s\n", 1713},
+ {"det_time=%-26.24s\n", 1714},
+ {"change_time=%-26.24s\n", 1715},
{"\
\n\
-Message Queue msqid=%d\n", 1718},
- {"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n", 1719},
- {"cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n", 1720},
- {"send_time=%-26.24s\n", 1721},
- {"rcv_time=%-26.24s\n", 1722},
+Message Queue msqid=%d\n", 1716},
+ {"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n", 1717},
+ {"cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n", 1718},
+ {"send_time=%-26.24s\n", 1719},
+ {"rcv_time=%-26.24s\n", 1720},
{"\
\n\
-Semaphore Array semid=%d\n", 1723},
- {"uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n", 1724},
- {"mode=%#o, access_perms=%#o\n", 1725},
- {"nsems = %ld\n", 1726},
- {"otime = %-26.24s\n", 1727},
- {"ctime = %-26.24s\n", 1728},
- {"%-10s %-10s %-10s %-10s %-10s\n", 1729},
- {"semnum", 1730},
- {"value", 1731},
- {"ncount", 1732},
- {"zcount", 1733},
- {"pid", 1734},
- {"usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]", 1735},
- {"\
- rdev /dev/fd0 (or rdev /linux, etc.) displays the current ROOT device", 1736},
- {" rdev /dev/fd0 /dev/hda2 sets ROOT to /dev/hda2", 1737},
- {" rdev -R /dev/fd0 1 set the ROOTFLAGS (readonly status)", 1738},
- {" rdev -r /dev/fd0 627 set the RAMDISK size", 1739},
- {" rdev -v /dev/fd0 1 set the bootup VIDEOMODE", 1740},
- {" rdev -o N ... use the byte offset N", 1741},
- {" rootflags ... same as rdev -R", 1742},
- {" ramsize ... same as rdev -r", 1743},
- {" vidmode ... same as rdev -v", 1744},
- {"\
-Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,...", 1745},
- {" use -R 1 to mount root readonly, -R 0 for read/write.", 1746},
- {"missing comma", 1747},
+Semaphore Array semid=%d\n", 1721},
+ {"uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n", 1722},
+ {"mode=%#o, access_perms=%#o\n", 1723},
+ {"nsems = %ld\n", 1724},
+ {"otime = %-26.24s\n", 1725},
+ {"ctime = %-26.24s\n", 1726},
+ {"semnum", 1727},
+ {"value", 1728},
+ {"ncount", 1729},
+ {"zcount", 1730},
+ {"pid", 1731},
+ {"usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]", 1732},
+ {"\
+ rdev /dev/fd0 (or rdev /linux, etc.) displays the current ROOT device", 1733},
+ {" rdev /dev/fd0 /dev/hda2 sets ROOT to /dev/hda2", 1734},
+ {" rdev -R /dev/fd0 1 set the ROOTFLAGS (readonly status)", 1735},
+ {" rdev -r /dev/fd0 627 set the RAMDISK size", 1736},
+ {" rdev -v /dev/fd0 1 set the bootup VIDEOMODE", 1737},
+ {" rdev -o N ... use the byte offset N", 1738},
+ {" rootflags ... same as rdev -R", 1739},
+ {" ramsize ... same as rdev -r", 1740},
+ {" vidmode ... same as rdev -v", 1741},
+ {"\
+Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,...", 1742},
+ {" use -R 1 to mount root readonly, -R 0 for read/write.", 1743},
+ {"missing comma", 1744},
{"\
%s: Usage: \"%s [options]\n\
\t -m <mapfile> (default = \"%s\")\n\
@@ -2273,108 +2273,128 @@ Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,...", 1
\t -a print all symbols, even if count is 0\n\
\t -r reset all the counters (root only)\n\
\t -n disable byte order auto-detection\n\
-\t -V print version and exit\n", 1748},
- {"out of memory", 1749},
- {"%s Version %s\n", 1750},
- {"Sampling_step: %i\n", 1751},
- {"%s: %s(%i): wrong map line\n", 1752},
- {"%s: can't find \"_stext\" in %s\n", 1753},
- {"%s: profile address out of range. Wrong map file?\n", 1754},
- {"total", 1755},
- {"\
-usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n", 1756},
- {"renice: %s: unknown user\n", 1757},
- {"renice: %s: bad value\n", 1758},
- {"getpriority", 1759},
- {"setpriority", 1760},
- {"%d: old priority %d, new priority %d\n", 1761},
- {"usage: %s program [arg ...]\n", 1762},
+\t -V print version and exit\n", 1745},
+ {"out of memory", 1746},
+ {"%s Version %s\n", 1747},
+ {"Sampling_step: %i\n", 1748},
+ {"%s: %s(%i): wrong map line\n", 1749},
+ {"%s: can't find \"_stext\" in %s\n", 1750},
+ {"%s: profile address out of range. Wrong map file?\n", 1751},
+ {"total", 1752},
+ {"\
+usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n", 1753},
+ {"renice: %s: unknown user\n", 1754},
+ {"renice: %s: bad value\n", 1755},
+ {"getpriority", 1756},
+ {"setpriority", 1757},
+ {"%d: old priority %d, new priority %d\n", 1758},
+ {"usage: %s program [arg ...]\n", 1759},
{"\
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", 1763},
- {"malloc error", 1764},
- {"%s: bad value\n", 1765},
- {"%s: %s not an lp device.\n", 1766},
- {"%s status is %d", 1767},
- {", busy", 1768},
- {", ready", 1769},
- {", out of paper", 1770},
- {", on-line", 1771},
- {", error", 1772},
- {"LPGETIRQ error", 1773},
- {"%s using IRQ %d\n", 1774},
- {"%s using polling\n", 1775},
- {"col: bad -l argument %s.\n", 1776},
- {"usage: col [-bfpx] [-l nline]\n", 1777},
- {"col: write error.\n", 1778},
- {"col: warning: can't back up %s.\n", 1779},
- {"past first line", 1780},
- {"-- line already flushed", 1781},
- {"usage: %s [ - ] [ -2 ] [ file ... ]\n", 1782},
- {"line too long", 1783},
- {"usage: column [-tx] [-c columns] [file ...]\n", 1784},
- {"hexdump: bad length value.\n", 1785},
- {"hexdump: bad skip value.\n", 1786},
- {"\
-hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n", 1787},
- {"usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n", 1788},
+ -T [on|off] ]\n", 1760},
+ {"malloc error", 1761},
+ {"%s: bad value\n", 1762},
+ {"%s: %s not an lp device.\n", 1763},
+ {"%s status is %d", 1764},
+ {", busy", 1765},
+ {", ready", 1766},
+ {", out of paper", 1767},
+ {", on-line", 1768},
+ {", error", 1769},
+ {"LPGETIRQ error", 1770},
+ {"%s using IRQ %d\n", 1771},
+ {"%s using polling\n", 1772},
+ {"col: bad -l argument %s.\n", 1773},
+ {"usage: col [-bfpx] [-l nline]\n", 1774},
+ {"col: write error.\n", 1775},
+ {"col: warning: can't back up %s.\n", 1776},
+ {"past first line", 1777},
+ {"-- line already flushed", 1778},
+ {"usage: %s [ - ] [ -2 ] [ file ... ]\n", 1779},
+ {"line too long", 1780},
+ {"usage: column [-tx] [-c columns] [file ...]\n", 1781},
+ {"hexdump: bad length value.\n", 1782},
+ {"hexdump: bad skip value.\n", 1783},
+ {"\
+hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n", 1784},
+ {"usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n", 1785},
{"\
\n\
*** %s: directory ***\n\
-\n", 1789},
+\n", 1786},
{"\
\n\
******** %s: Not a text file ********\n\
-\n", 1790},
- {"[Use q or Q to quit]", 1791},
- {"--More--", 1792},
- {"(Next file: %s)", 1793},
- {"[Press space to continue, 'q' to quit.]", 1794},
- {"...back %d pages", 1795},
- {"...back 1 page", 1796},
- {"...skipping %d line", 1797},
+\n", 1787},
+ {"[Use q or Q to quit]", 1788},
+ {"--More--", 1789},
+ {"(Next file: %s)", 1790},
+ {"[Press space to continue, 'q' to quit.]", 1791},
+ {"...back %d pages", 1792},
+ {"...back 1 page", 1793},
+ {"...skipping %d line", 1794},
{"\
\n\
***Back***\n\
-\n", 1798},
- {"Can't open help file", 1799},
- {"[Press 'h' for instructions.]", 1800},
- {"\"%s\" line %d", 1801},
- {"[Not a file] line %d", 1802},
- {" Overflow\n", 1803},
- {"...skipping\n", 1804},
- {"Regular expression botch", 1805},
+\n", 1795},
+ {"Can't open help file", 1796},
+ {"[Press 'h' for instructions.]", 1797},
+ {"\"%s\" line %d", 1798},
+ {"[Not a file] line %d", 1799},
+ {" Overflow\n", 1800},
+ {"...skipping\n", 1801},
+ {"Regular expression botch", 1802},
{"\
\n\
-Pattern not found\n", 1806},
- {"Pattern not found", 1807},
- {"can't fork\n", 1808},
+Pattern not found\n", 1803},
+ {"Pattern not found", 1804},
+ {"can't fork\n", 1805},
{"\
\n\
-...Skipping ", 1809},
- {"...Skipping to file ", 1810},
- {"...Skipping back to file ", 1811},
- {"Line too long", 1812},
- {"No previous command to substitute for", 1813},
- {"od: od(1) has been deprecated for hexdump(1).\n", 1814},
- {"od: hexdump(1) compatibility doesn't support the -%c option%s\n", 1815},
- {"; see strings(1).", 1816},
- {"hexdump: can't read %s.\n", 1817},
- {"hexdump: line too long.\n", 1818},
- {"hexdump: byte count with multiple conversion characters.\n", 1819},
- {"hexdump: bad byte count for conversion character %s.\n", 1820},
- {"hexdump: %%s requires a precision or a byte count.\n", 1821},
- {"hexdump: bad format {%s}\n", 1822},
- {"hexdump: bad conversion character %%%s.\n", 1823},
- {"Unable to allocate bufferspace\n", 1824},
- {"usage: rev [file ...]\n", 1825},
- {"usage: %s [ -i ] [ -tTerm ] file...\n", 1826},
- {"trouble reading terminfo", 1827},
- {"Unknown escape sequence in input: %o, %o\n", 1828},
- {"Unable to allocate buffer.\n", 1829},
- {"Input line too long.\n", 1830},
- {"Out of memory when growing buffer.\n", 1831},
+...Skipping ", 1806},
+ {"...Skipping to file ", 1807},
+ {"...Skipping back to file ", 1808},
+ {"Line too long", 1809},
+ {"No previous command to substitute for", 1810},
+ {"od: od(1) has been deprecated for hexdump(1).\n", 1811},
+ {"od: hexdump(1) compatibility doesn't support the -%c option%s\n", 1812},
+ {"; see strings(1).", 1813},
+ {"hexdump: can't read %s.\n", 1814},
+ {"hexdump: line too long.\n", 1815},
+ {"hexdump: byte count with multiple conversion characters.\n", 1816},
+ {"hexdump: bad byte count for conversion character %s.\n", 1817},
+ {"hexdump: %%s requires a precision or a byte count.\n", 1818},
+ {"hexdump: bad format {%s}\n", 1819},
+ {"hexdump: bad conversion character %%%s.\n", 1820},
+ {"\
+%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n", 1821},
+ {"%s: option requires an argument -- %s\n", 1822},
+ {"%s: illegal option -- %s\n", 1823},
+ {"...skipping forward\n", 1824},
+ {"...skipping backward\n", 1825},
+ {"No next file", 1826},
+ {"No previous file", 1827},
+ {"%s: Read error from %s file\n", 1828},
+ {"%s: Unexpected EOF in %s file\n", 1829},
+ {"%s: Unknown error in %s file\n", 1830},
+ {"%s: Cannot create tempfile\n", 1831},
+ {"RE error: ", 1832},
+ {"(EOF)", 1833},
+ {"No remembered search string", 1834},
+ {"Cannot open ", 1835},
+ {"saved", 1836},
+ {": !command not allowed in rflag mode.\n", 1837},
+ {"fork() failed, try again later\n", 1838},
+ {"(Next file: ", 1839},
+ {"Unable to allocate bufferspace\n", 1840},
+ {"usage: rev [file ...]\n", 1841},
+ {"usage: %s [ -i ] [ -tTerm ] file...\n", 1842},
+ {"trouble reading terminfo", 1843},
+ {"Unknown escape sequence in input: %o, %o\n", 1844},
+ {"Unable to allocate buffer.\n", 1845},
+ {"Input line too long.\n", 1846},
+ {"Out of memory when growing buffer.\n", 1847},
};
-int _msg_tbl_length = 1831;
+int _msg_tbl_length = 1847;
diff --git a/po/cs.po b/po/cs.po
index 950b3f026..aaf2362da 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: util-linux-2.11d\n"
-"POT-Creation-Date: 2002-05-09 02:51+0200\n"
+"POT-Creation-Date: 2002-07-07 17:03+0200\n"
"PO-Revision-Date: 2001-05-30 15:11+0200\n"
"Last-Translator: Jiøí Pavlovský <pavlovsk@ff.cuni.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
@@ -110,28 +110,28 @@ msgstr ""
msgid "usage:\n"
msgstr "Pou¾ití:\n"
-#: disk-utils/fdformat.c:35
+#: disk-utils/fdformat.c:31
msgid "Formatting ... "
msgstr "Formátuji ... "
-#: disk-utils/fdformat.c:53 disk-utils/fdformat.c:88
+#: disk-utils/fdformat.c:49 disk-utils/fdformat.c:84
msgid "done\n"
msgstr "hotovo\n"
-#: disk-utils/fdformat.c:64
+#: disk-utils/fdformat.c:60
msgid "Verifying ... "
msgstr "Ovìøuji ... "
-#: disk-utils/fdformat.c:75
+#: disk-utils/fdformat.c:71
msgid "Read: "
msgstr "Chyba pøi ètení: "
-#: disk-utils/fdformat.c:77
+#: disk-utils/fdformat.c:73
#, c-format
msgid "Problem reading cylinder %d, expected %d, read %d\n"
msgstr "Chyba pøi ètení cylindru %d, pøedpoklad %d, pøeèteno %d\n"
-#: disk-utils/fdformat.c:83
+#: disk-utils/fdformat.c:79
#, c-format
msgid ""
"bad data in cyl %d\n"
@@ -140,42 +140,148 @@ msgstr ""
"chybná data v cylindru %d\n"
"Pokraèuji ... "
-#: disk-utils/fdformat.c:98
+#: disk-utils/fdformat.c:94
#, c-format
msgid "usage: %s [ -n ] device\n"
msgstr "Pou¾ití: %s [ -n ] zaøízení\n"
-#: disk-utils/fdformat.c:120 disk-utils/fsck.minix.c:1291
+#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1291
#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:55
-#: disk-utils/mkfs.minix.c:644 disk-utils/mkswap.c:457
-#: disk-utils/setfdprm.c:128 misc-utils/cal.c:246 misc-utils/ddate.c:181
-#: misc-utils/kill.c:188 misc-utils/rename.c:79 misc-utils/script.c:132
+#: disk-utils/mkfs.cramfs.c:665 disk-utils/mkfs.minix.c:644
+#: disk-utils/mkswap.c:457 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1170
+#: misc-utils/cal.c:246 misc-utils/ddate.c:181 misc-utils/kill.c:188
+#: misc-utils/rename.c:79 misc-utils/script.c:132
#, c-format
msgid "%s from %s\n"
msgstr "%s na %s\n"
-#: disk-utils/fdformat.c:134
-#, c-format
-msgid "%s: not a floppy device\n"
+#: disk-utils/fdformat.c:130
+#, fuzzy, c-format
+msgid "%s: not a block device\n"
msgstr "%s není zaøízením pru¾ného disku\n"
-#: disk-utils/fdformat.c:143
+#: disk-utils/fdformat.c:140
msgid "Could not determine current format type"
msgstr "Typ formátu nelze zjistit"
-#: disk-utils/fdformat.c:144
+#: disk-utils/fdformat.c:141
#, c-format
msgid "%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n"
msgstr "stran: %s, stop: %d, sekt/stopu %d. Celková kapacita %d kB.\n"
-#: disk-utils/fdformat.c:145
+#: disk-utils/fdformat.c:142
msgid "Double"
msgstr "2"
-#: disk-utils/fdformat.c:145
+#: disk-utils/fdformat.c:142
msgid "Single"
msgstr "1"
+#: disk-utils/fsck.cramfs.c:98
+#, c-format
+msgid ""
+"usage: %s [-hv] [-x dir] file\n"
+" -h print this help\n"
+" -x dir extract into dir\n"
+" -v be more verbose\n"
+" file file to test\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:191
+#, c-format
+msgid "%s: error %d while decompressing! %p(%d)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:243
+#, fuzzy, c-format
+msgid "%s: size error in symlink `%s'\n"
+msgstr "%s: chyba zápisu na %s\n"
+
+#: disk-utils/fsck.cramfs.c:258 disk-utils/fsck.cramfs.c:328
+#, c-format
+msgid " uncompressing block at %ld to %ld (%ld)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:287
+#, c-format
+msgid "%s: bogus mode on `%s' (%o)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:319
+#, fuzzy, c-format
+msgid " hole at %ld (%d)\n"
+msgstr "mìlo by být (%d, %d, %d)\n"
+
+#: disk-utils/fsck.cramfs.c:337
+#, c-format
+msgid "%s: Non-block (%ld) bytes\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:343
+#, c-format
+msgid "%s: Non-size (%ld vs %ld) bytes\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:392
+#, c-format
+msgid "%s: invalid cramfs--bad path length\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:472
+#, fuzzy, c-format
+msgid "%s: compiled without -x support\n"
+msgstr "pøi pøekladu %s nebyla zvolena podpora minix v2\n"
+
+#: disk-utils/fsck.cramfs.c:498
+#, c-format
+msgid "%s: warning--unable to determine filesystem size \n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:508
+#, fuzzy, c-format
+msgid "%s is not a block device or file\n"
+msgstr "%s není zaøízením pru¾ného disku\n"
+
+#: disk-utils/fsck.cramfs.c:514 disk-utils/fsck.cramfs.c:549
+#, c-format
+msgid "%s: invalid cramfs--file length too short\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:541
+#, c-format
+msgid "%s: invalid cramfs--wrong magic\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:554
+#, c-format
+msgid "%s: warning--file length too long, padded image?\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:564
+#, fuzzy, c-format
+msgid "%s: invalid cramfs--crc error\n"
+msgstr "%s: chyba pøi analýze pøepínaèù\n"
+
+#: disk-utils/fsck.cramfs.c:570
+#, c-format
+msgid "%s: warning--old cramfs image, no CRC\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:592
+#, c-format
+msgid "%s: invalid cramfs--bad superblock\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:608
+#, c-format
+msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:616
+#, c-format
+msgid "%s: invalid cramfs--invalid file data offset\n"
+msgstr ""
+
#: disk-utils/fsck.minix.c:200
#, c-format
msgid "Usage: %s [-larvsmf] /dev/name\n"
@@ -640,7 +746,7 @@ msgstr "pøíli¹ mnoho iuzlù - maximum je 512"
msgid "not enough space, need at least %lu blocks"
msgstr "nedostatek místa, minimální potøebný poèet blokù: %lu"
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2057
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2069
#, c-format
msgid "Device: %s\n"
msgstr "Zaøízení: %s\n"
@@ -724,6 +830,130 @@ msgstr "%s: Nedostatek pamìti!\n"
msgid "mkfs version %s (%s)\n"
msgstr "mkfs verze %s (%s)\n"
+#: disk-utils/mkfs.cramfs.c:49
+#, c-format
+msgid ""
+"usage: %s [-h] [-v] [-e edition] [-i file] [-n name] dirname outfile\n"
+" -h print this help\n"
+" -v be verbose\n"
+" -E make all warnings errors (non-zero exit status)\n"
+" -e edition set edition number (part of fsid)\n"
+" -i file insert a file image into the filesystem (requires >= 2.4.0)\n"
+" -n name set name of cramfs filesystem\n"
+" -p pad by %d bytes for boot code\n"
+" -s sort directory entries (old option, ignored)\n"
+" -z make explicit holes (requires >= 2.3.39)\n"
+" dirname root of the filesystem to be compressed\n"
+" outfile output file\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:213
+#, c-format
+msgid ""
+"Very long (%u bytes) filename `%s' found.\n"
+" Please increase MAX_INPUT_NAMELEN in mkcramfs.c and recompile. Exiting.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:371
+msgid "filesystem too big. Exiting.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:422
+msgid ""
+"Exceeded MAXENTRIES. Raise this value in mkcramfs.c and recompile. "
+"Exiting.\n"
+msgstr ""
+
+#. (I don't think this can happen with zlib.)
+#: disk-utils/mkfs.cramfs.c:520
+#, c-format
+msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:537
+#, c-format
+msgid "%6.2f%% (%+d bytes)\t%s\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:705
+#, c-format
+msgid ""
+"warning: guestimate of required size (upper bound) is %LdMB, but maximum "
+"image size is %uMB. We might die prematurely.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:747
+#, fuzzy, c-format
+msgid "Including: %s\n"
+msgstr "Chybné id: %s\n"
+
+#: disk-utils/mkfs.cramfs.c:753
+#, c-format
+msgid "Directory data: %d bytes\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:761
+#, c-format
+msgid "Everything: %d kilobytes\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:766
+#, fuzzy, c-format
+msgid "Super block: %d bytes\n"
+msgstr "pou¾itý prostor (v bajtech) = %d\n"
+
+#: disk-utils/mkfs.cramfs.c:773
+#, c-format
+msgid "CRC: %x\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:778
+#, c-format
+msgid "not enough space allocated for ROM image (%Ld allocated, %d used)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:790
+#, c-format
+msgid "ROM image write failed (%d %d)\n"
+msgstr ""
+
+#. (These warnings used to come at the start, but they scroll off the
+#. screen too quickly.)
+#. (can't happen when reading from ext2fs)
+#. bytes, not chars: think UTF8.
+#: disk-utils/mkfs.cramfs.c:799
+#, fuzzy
+msgid "warning: filenames truncated to 255 bytes.\n"
+msgstr "Varování: poèet i-uzlù je pøíli¹ veliký.\n"
+
+#: disk-utils/mkfs.cramfs.c:802
+msgid "warning: files were skipped due to errors.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:805
+#, c-format
+msgid "warning: file sizes truncated to %luMB (minus 1 byte).\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:810
+#, c-format
+msgid ""
+"warning: uids truncated to %u bits. (This may be a security concern.)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:815
+#, c-format
+msgid ""
+"warning: gids truncated to %u bits. (This may be a security concern.)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:820
+#, c-format
+msgid ""
+"WARNING: device numbers truncated to %u bits. This almost certainly means\n"
+"that some device files will be wrong.\n"
+msgstr ""
+
#: disk-utils/mkfs.minix.c:181
#, c-format
msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
@@ -868,7 +1098,7 @@ msgid "too many bad pages"
msgstr "pøíli¹ mnoho chybných stránek"
#: disk-utils/mkswap.c:359 misc-utils/look.c:182 misc-utils/setterm.c:1130
-#: text-utils/more.c:2062 text-utils/more.c:2073
+#: text-utils/more.c:2063 text-utils/more.c:2074
msgid "Out of memory"
msgstr "Nedostatek pamìti"
@@ -1314,7 +1544,7 @@ msgstr " Logický"
#. odd flag on end
#. type id
#. type name
-#: fdisk/cfdisk.c:1996 fdisk/fdisk.c:1306 fdisk/fdisk.c:1594
+#: fdisk/cfdisk.c:1996 fdisk/fdisk.c:1318 fdisk/fdisk.c:1606
#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:690 fdisk/sfdisk.c:581
msgid "Unknown"
msgstr "Neznámý"
@@ -1848,7 +2078,7 @@ msgstr ""
" jádro.\n"
"\n"
-#: fdisk/fdisk.c:194
+#: fdisk/fdisk.c:195
#, fuzzy
msgid ""
"Usage: fdisk [-b SSZ] [-u] DISK Change partition table\n"
@@ -1869,7 +2099,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:206
+#: fdisk/fdisk.c:207
msgid ""
"Usage: fdisk [-l] [-b SSZ] [-u] device\n"
"E.g.: fdisk /dev/hda (for the first IDE disk)\n"
@@ -1885,223 +2115,223 @@ msgstr ""
" èi: fdisk /dev/rd/c0d0 èi: fdisk /dev/ida/c0d0 (pro RAID zaøízení)\n"
" ...\n"
-#: fdisk/fdisk.c:215
+#: fdisk/fdisk.c:216
#, c-format
msgid "Unable to open %s\n"
msgstr "%s nelze otevøít\n"
-#: fdisk/fdisk.c:219
+#: fdisk/fdisk.c:220
#, c-format
msgid "Unable to read %s\n"
msgstr "%s nelze èíst\n"
-#: fdisk/fdisk.c:223
+#: fdisk/fdisk.c:224
#, c-format
msgid "Unable to seek on %s\n"
msgstr "Ukazovátko nelze posunout na %s.\n"
-#: fdisk/fdisk.c:227
+#: fdisk/fdisk.c:228
#, c-format
msgid "Unable to write %s\n"
msgstr "%s nelze ulo¾it\n"
-#: fdisk/fdisk.c:231
+#: fdisk/fdisk.c:232
#, c-format
msgid "BLKGETSIZE ioctl failed on %s\n"
msgstr "volání BLKGETSIZE ioctl pro %s selhalo\n"
-#: fdisk/fdisk.c:235
+#: fdisk/fdisk.c:236
msgid "Unable to allocate any more memory\n"
msgstr "Nelze alokovat více pamìti\n"
-#: fdisk/fdisk.c:238
+#: fdisk/fdisk.c:239
msgid "Fatal error\n"
msgstr "Fatální chyba\n"
-#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:359 fdisk/fdisk.c:366
-#: fdisk/fdisk.c:389 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:439
-#: fdisk/fdiskbsdlabel.c:124
+#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:360 fdisk/fdisk.c:367
+#: fdisk/fdisk.c:390 fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:440
+#: fdisk/fdiskbsdlabel.c:129
msgid "Command action"
msgstr "Pøíkazy"
-#: fdisk/fdisk.c:323
+#: fdisk/fdisk.c:324
msgid " a toggle a read only flag"
msgstr " a pøepne pøíznak \"pouze pro ètení\""
#. sun
-#: fdisk/fdisk.c:324 fdisk/fdisk.c:368
+#: fdisk/fdisk.c:325 fdisk/fdisk.c:369
msgid " b edit bsd disklabel"
msgstr " b úprava bsd popisu disku"
-#: fdisk/fdisk.c:325
+#: fdisk/fdisk.c:326
msgid " c toggle the mountable flag"
msgstr " c pøepne pøíznak \"pøipojitelný\""
#. sun
-#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:370
+#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:371
msgid " d delete a partition"
msgstr " d sma¾e diskový oddíl"
-#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:371
+#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:372
msgid " l list known partition types"
msgstr " l vypí¹e známé typy diskových oddílù"
#. sun
-#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:360 fdisk/fdisk.c:372
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
-#: fdisk/fdiskbsdlabel.c:129
+#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:361 fdisk/fdisk.c:373
+#: fdisk/fdisk.c:398 fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
+#: fdisk/fdiskbsdlabel.c:134
msgid " m print this menu"
msgstr " m vypí¹e tuto nabídku"
-#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
+#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374
msgid " n add a new partition"
msgstr " n vytvoøí nový diskový oddíl"
-#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:361 fdisk/fdisk.c:374
+#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:362 fdisk/fdisk.c:375
msgid " o create a new empty DOS partition table"
msgstr " o vytvoøí prázdný DOSOVÝ diskový oddíl"
-#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:375 fdisk/fdisk.c:398
-#: fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:376 fdisk/fdisk.c:399
+#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
msgid " p print the partition table"
msgstr " p vypí¹e tabulku rozdìlení disku"
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:362 fdisk/fdisk.c:376
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
-#: fdisk/fdiskbsdlabel.c:132
+#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:363 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:450
+#: fdisk/fdiskbsdlabel.c:137
msgid " q quit without saving changes"
msgstr " q ukonèí program bez ulo¾ení zmìn"
-#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:363 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:364 fdisk/fdisk.c:378
msgid " s create a new empty Sun disklabel"
msgstr " s vytvoøí prázdný Sun popis disku"
#. sun
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
msgid " t change a partition's system id"
msgstr " t zmìní id diskového oddílu"
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
msgid " u change display/entry units"
msgstr " u zmìní jednotky v nich¾ jsou vypisovány informace"
-#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380 fdisk/fdisk.c:402
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:452
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381 fdisk/fdisk.c:403
+#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
msgid " v verify the partition table"
msgstr " v ovìøí tabulku rozdìlení disku"
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381 fdisk/fdisk.c:403
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:382 fdisk/fdisk.c:404
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
msgid " w write table to disk and exit"
msgstr " w ulo¾í tabulku rozdìlení disku a ukonèí program"
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:383
msgid " x extra functionality (experts only)"
msgstr " x roz¹iøující funkce (pouze pro odborníky)"
-#: fdisk/fdisk.c:342
+#: fdisk/fdisk.c:343
msgid " a select bootable partition"
msgstr " a nastaví startovací diskový oddíl"
#. sgi flavour
-#: fdisk/fdisk.c:343
+#: fdisk/fdisk.c:344
msgid " b edit bootfile entry"
msgstr " b úprava polo¾ky startovacího souboru"
#. sgi
-#: fdisk/fdisk.c:344
+#: fdisk/fdisk.c:345
msgid " c select sgi swap partition"
msgstr " c nastaví sgi odkládací diskový oddíl"
-#: fdisk/fdisk.c:367
+#: fdisk/fdisk.c:368
msgid " a toggle a bootable flag"
msgstr " a pøepne pøíznak \"startovací\""
-#: fdisk/fdisk.c:369
+#: fdisk/fdisk.c:370
msgid " c toggle the dos compatibility flag"
msgstr " c pøepne pøíznak \"DOS kompatibilní\""
-#: fdisk/fdisk.c:390
+#: fdisk/fdisk.c:391
msgid " a change number of alternate cylinders"
msgstr " a zmìní mno¾ství alternativních cylindrù"
#. sun
-#: fdisk/fdisk.c:391 fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:441
+#: fdisk/fdisk.c:392 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
msgid " c change number of cylinders"
msgstr " c zmìní mno¾ství cylindrù"
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:393 fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:443
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:393
+#: fdisk/fdisk.c:394
msgid " e change number of extra sectors per cylinder"
msgstr " e zmìní mno¾ství extra sektorù na stopu"
#. sun
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:395 fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
msgid " h change number of heads"
msgstr " h zmìní mno¾ství hlav"
-#: fdisk/fdisk.c:395
+#: fdisk/fdisk.c:396
msgid " i change interleave factor"
msgstr " i zmìní prokládací faktor"
#. sun
-#: fdisk/fdisk.c:396
+#: fdisk/fdisk.c:397
msgid " o change rotation speed (rpm)"
msgstr " o zmìní rychlost otáèení"
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:450
-#: fdisk/fdiskbsdlabel.c:133
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:451
+#: fdisk/fdiskbsdlabel.c:138
msgid " r return to main menu"
msgstr " r návrat do hlavní nabídky"
-#: fdisk/fdisk.c:401 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:452
msgid " s change number of sectors/track"
msgstr " s zmìní poèet sektorù/stopu"
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:405
msgid " y change number of physical cylinders"
msgstr " y zmìní poèet fyzických cylindrù"
-#: fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:440
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:441
msgid " b move beginning of data in a partition"
msgstr " b posune poèátek dat v diskovém oddílu"
-#: fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:443
+#: fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:444
msgid " e list extended partitions"
msgstr " e vypí¹e roz¹íøené diskové oddíly"
#. !sun
-#: fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
#, fuzzy
msgid " g create an IRIX (SGI) partition table"
msgstr " g vytvoøí IRIX tabulku rozdìlení disku"
#. !sun
-#: fdisk/fdisk.c:444
+#: fdisk/fdisk.c:445
msgid " f fix partition order"
msgstr " f opraví øazení diskových oddílù"
-#: fdisk/fdisk.c:561
+#: fdisk/fdisk.c:562
msgid "You must set"
msgstr "Musíte nastavit"
-#: fdisk/fdisk.c:575
+#: fdisk/fdisk.c:576
msgid "heads"
msgstr "hlavy"
-#: fdisk/fdisk.c:577 fdisk/fdisk.c:1142 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:578 fdisk/fdisk.c:1154 fdisk/sfdisk.c:864
msgid "sectors"
msgstr "sektory"
-#: fdisk/fdisk.c:579 fdisk/fdisk.c:1142 fdisk/fdiskbsdlabel.c:464
+#: fdisk/fdisk.c:580 fdisk/fdisk.c:1154 fdisk/fdiskbsdlabel.c:469
#: fdisk/sfdisk.c:864
msgid "cylinders"
msgstr "cylindry"
-#: fdisk/fdisk.c:583
+#: fdisk/fdisk.c:584
#, c-format
msgid ""
"%s%s.\n"
@@ -2110,11 +2340,11 @@ msgstr ""
"%s%s.\n"
"Mù¾ete tak uèinit z nabídky roz¹iøujících funkcí.\n"
-#: fdisk/fdisk.c:584
+#: fdisk/fdisk.c:585
msgid " and "
msgstr " a "
-#: fdisk/fdisk.c:601
+#: fdisk/fdisk.c:602
#, c-format
msgid ""
"\n"
@@ -2133,26 +2363,26 @@ msgstr ""
"2) s programy pro správu diskových oddílù z jiných OS\n"
" (napø. DOS FDISK, OS/2 FDISK)\n"
-#: fdisk/fdisk.c:624
+#: fdisk/fdisk.c:625
msgid "Bad offset in primary extended partition\n"
msgstr "Chybný posun v primárním diskovém oddílu\n"
-#: fdisk/fdisk.c:638
+#: fdisk/fdisk.c:639
#, c-format
msgid "Warning: deleting partitions after %d\n"
msgstr "Varování: ma¾u diskový oddíl za %d\n"
-#: fdisk/fdisk.c:655
+#: fdisk/fdisk.c:656
#, 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:663
+#: fdisk/fdisk.c:664
#, 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:708
+#: fdisk/fdisk.c:709
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"
@@ -2165,16 +2395,22 @@ msgstr ""
"data\n"
"pochopitelnì dostupná.\n"
-#: fdisk/fdisk.c:752
+#: fdisk/fdisk.c:753
#, c-format
msgid "Note: sector size is %d (not %d)\n"
msgstr "Pozor: velikost sektoru je %d (nikoliv %d)\n"
-#: fdisk/fdisk.c:870
+#: fdisk/fdisk.c:883
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:903
+#: fdisk/fdisk.c:914
+msgid ""
+"This disk has both DOS and BSD magic.\n"
+"Give the 'b' command to go to BSD mode.\n"
+msgstr ""
+
+#: fdisk/fdisk.c:924
msgid ""
"Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
"disklabel\n"
@@ -2183,16 +2419,16 @@ msgstr ""
"popis\n"
"disku\n"
-#: fdisk/fdisk.c:920
+#: fdisk/fdisk.c:942
msgid "Internal error\n"
msgstr "Vnitøní chyba\n"
-#: fdisk/fdisk.c:942
+#: fdisk/fdisk.c:954
#, c-format
msgid "Ignoring extra extended partition %d\n"
msgstr "Nadbyteèný roz¹íøený diskový oddíl %d ignorován.\n"
-#: fdisk/fdisk.c:954
+#: fdisk/fdisk.c:966
#, c-format
msgid ""
"Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2201,7 +2437,7 @@ msgstr ""
"Varování: chybný pøíznak 0x%04x tabulky rozdìlení disku %d bude opraven "
"zápisem(w)\n"
-#: fdisk/fdisk.c:976
+#: fdisk/fdisk.c:988
msgid ""
"\n"
"got EOF thrice - exiting..\n"
@@ -2209,65 +2445,65 @@ msgstr ""
"\n"
"tøikrát jsem nalezl EOF - konèím..\n"
-#: fdisk/fdisk.c:1015
+#: fdisk/fdisk.c:1027
msgid "Hex code (type L to list codes): "
msgstr "©estnáctkovì (L vypí¹e kódy):"
-#: fdisk/fdisk.c:1054
+#: fdisk/fdisk.c:1066
#, c-format
msgid "%s (%d-%d, default %d): "
msgstr "%s (%d-%d, implicitnì %d): "
-#: fdisk/fdisk.c:1110
+#: fdisk/fdisk.c:1122
#, c-format
msgid "Using default value %d\n"
msgstr "Pou¾ívám implicitní hodnotu %d\n"
-#: fdisk/fdisk.c:1114
+#: fdisk/fdisk.c:1126
msgid "Value out of range.\n"
msgstr "Hodnota je mimo meze.\n"
-#: fdisk/fdisk.c:1124
+#: fdisk/fdisk.c:1136
msgid "Partition number"
msgstr "Èíslo diskového oddílu"
-#: fdisk/fdisk.c:1133
+#: fdisk/fdisk.c:1145
#, 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:1140
+#: fdisk/fdisk.c:1152
msgid "cylinder"
msgstr "cylindr"
-#: fdisk/fdisk.c:1140
+#: fdisk/fdisk.c:1152
msgid "sector"
msgstr "sektor"
-#: fdisk/fdisk.c:1149
+#: fdisk/fdisk.c:1161
#, 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:1160
+#: fdisk/fdisk.c:1172
#, 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:1171
+#: fdisk/fdisk.c:1183
msgid "DOS Compatibility flag is set\n"
msgstr "Pøíznak DOSOVÉ kompatibility je nastaven.\n"
-#: fdisk/fdisk.c:1175
+#: fdisk/fdisk.c:1187
msgid "DOS Compatibility flag is not set\n"
msgstr "Pøíznak DOSOVÉ kompatibility není nastaven.\n"
-#: fdisk/fdisk.c:1261
+#: fdisk/fdisk.c:1273
#, c-format
msgid "Partition %d does not exist yet!\n"
msgstr "Diskový oddíl %d zatím neexistuje!\n"
-#: fdisk/fdisk.c:1266
+#: fdisk/fdisk.c:1278
msgid ""
"Type 0 means free space to many systems\n"
"(but not to Linux). Having partitions of\n"
@@ -2278,7 +2514,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:1275
+#: fdisk/fdisk.c:1287
msgid ""
"You cannot change a partition into an extended one or vice versa\n"
"Delete it first.\n"
@@ -2286,7 +2522,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:1284
+#: fdisk/fdisk.c:1296
msgid ""
"Consider leaving partition 3 as Whole disk (5),\n"
"as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2296,7 +2532,7 @@ msgstr ""
"nebo» SunOS/Solaris to oèekává a i Linux tomu dává pøednost.\n"
"\n"
-#: fdisk/fdisk.c:1290
+#: fdisk/fdisk.c:1302
msgid ""
"Consider leaving partition 9 as volume header (0),\n"
"and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2307,53 +2543,53 @@ msgstr ""
"a diskový oddíl 11 jako celý svazek (6), nebo» IRIX to oèekává.\n"
"\n"
-#: fdisk/fdisk.c:1303
+#: fdisk/fdisk.c:1315
#, 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:1357
+#: fdisk/fdisk.c:1369
#, 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:1359 fdisk/fdisk.c:1367 fdisk/fdisk.c:1376 fdisk/fdisk.c:1385
+#: fdisk/fdisk.c:1371 fdisk/fdisk.c:1379 fdisk/fdisk.c:1388 fdisk/fdisk.c:1397
#, c-format
msgid " phys=(%d, %d, %d) "
msgstr " fyz=(%d, %d, %d) "
-#: fdisk/fdisk.c:1360 fdisk/fdisk.c:1368
+#: fdisk/fdisk.c:1372 fdisk/fdisk.c:1380
#, c-format
msgid "logical=(%d, %d, %d)\n"
msgstr "logický=(%d, %d, %d)\n"
-#: fdisk/fdisk.c:1365
+#: fdisk/fdisk.c:1377
#, 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:1374
+#: fdisk/fdisk.c:1386
#, 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:1377
+#: fdisk/fdisk.c:1389
#, c-format
msgid "should be (%d, %d, 1)\n"
msgstr "mìlo by být (%d, %d, 1)\n"
-#: fdisk/fdisk.c:1383
+#: fdisk/fdisk.c:1395
#, 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:1386
+#: fdisk/fdisk.c:1398
#, c-format
msgid "should be (%d, %d, %d)\n"
msgstr "mìlo by být (%d, %d, %d)\n"
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1405
#, c-format
msgid ""
"\n"
@@ -2365,7 +2601,7 @@ msgstr ""
"Disk %s: hlav: %d, sektorù: %d, cylindrù: %d\n"
"Jednotky = %s po %d * %d bajtech\n"
-#: fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1513
msgid ""
"Nothing to do. Ordering is correct already.\n"
"\n"
@@ -2373,16 +2609,16 @@ msgstr ""
"Diskové oddíly jsou ji¾ seøazeny.\n"
"\n"
-#: fdisk/fdisk.c:1565
+#: fdisk/fdisk.c:1577
#, c-format
msgid "%*s Boot Start End Blocks Id System\n"
msgstr "%*s Boot Zaèátek Konec Bloky Id Systém\n"
-#: fdisk/fdisk.c:1566 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:675
+#: fdisk/fdisk.c:1578 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:675
msgid "Device"
msgstr "Zaøízení"
-#: fdisk/fdisk.c:1603
+#: fdisk/fdisk.c:1615
msgid ""
"\n"
"Partition table entries are not in disk order\n"
@@ -2390,7 +2626,7 @@ msgstr ""
"\n"
"Diskové oddíly jsou chybnì seøazeny\n"
-#: fdisk/fdisk.c:1613
+#: fdisk/fdisk.c:1625
#, c-format
msgid ""
"\n"
@@ -2401,93 +2637,93 @@ msgstr ""
"Disk %s: hlav: %d, sektorù: %d, cylindrù: %d\n"
"\n"
-#: fdisk/fdisk.c:1615
+#: fdisk/fdisk.c:1627
msgid "Nr AF Hd Sec Cyl Hd Sec Cyl Start Size ID\n"
msgstr "È AF Hd Sek Cyl Hd Sek Cyl Zaèátek Vel Id\n"
-#: fdisk/fdisk.c:1659
+#: fdisk/fdisk.c:1671
#, c-format
msgid "Warning: partition %d contains sector 0\n"
msgstr "Varování: diskový oddíl %d obsahuje sektor 0\n"
-#: fdisk/fdisk.c:1662
+#: fdisk/fdisk.c:1674
#, 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:1665
+#: fdisk/fdisk.c:1677
#, 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:1668
+#: fdisk/fdisk.c:1680
#, 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:1672
+#: fdisk/fdisk.c:1684
#, 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:1704
+#: fdisk/fdisk.c:1716
#, 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:1712
+#: fdisk/fdisk.c:1724
#, 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:1732
+#: fdisk/fdisk.c:1744
#, c-format
msgid "Warning: partition %d is empty\n"
msgstr "Varování: diskový oddíl %d je prázdný.\n"
-#: fdisk/fdisk.c:1737
+#: fdisk/fdisk.c:1749
#, 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:1743
+#: fdisk/fdisk.c:1755
#, 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:1746
+#: fdisk/fdisk.c:1758
#, c-format
msgid "%d unallocated sectors\n"
msgstr "nealokovaných sektorù: %d\n"
-#: fdisk/fdisk.c:1759 fdisk/fdisksgilabel.c:661 fdisk/fdisksunlabel.c:505
+#: fdisk/fdisk.c:1771 fdisk/fdisksgilabel.c:661 fdisk/fdisksunlabel.c:505
#, 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:1780 fdisk/fdiskbsdlabel.c:279 fdisk/fdisksgilabel.c:683
+#: fdisk/fdisk.c:1792 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:683
#: fdisk/fdisksunlabel.c:520
#, c-format
msgid "First %s"
msgstr "První %s"
-#: fdisk/fdisk.c:1795 fdisk/fdisksunlabel.c:561
+#: fdisk/fdisk.c:1807 fdisk/fdisksunlabel.c:561
#, c-format
msgid "Sector %d is already allocated\n"
msgstr "Sektor %d je ji¾ alokován\n"
-#: fdisk/fdisk.c:1831
+#: fdisk/fdisk.c:1843
msgid "No free sectors available\n"
msgstr "Nejsou ¾ádné volné sektory.\n"
-#: fdisk/fdisk.c:1840 fdisk/fdiskbsdlabel.c:286 fdisk/fdisksunlabel.c:572
+#: fdisk/fdisk.c:1852 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:572
#, c-format
msgid "Last %s or +size or +sizeM or +sizeK"
msgstr "Poslední %s èi +velikost èi +velikostM èi velikostK"
-#: fdisk/fdisk.c:1905
+#: fdisk/fdisk.c:1917
msgid ""
"\tSorry - this fdisk cannot handle AIX disk labels.\n"
"\tIf you want to add DOS-type partitions, create\n"
@@ -2495,15 +2731,15 @@ msgid ""
"\tWARNING: This will destroy the present disk contents.\n"
msgstr ""
-#: fdisk/fdisk.c:1914 fdisk/fdiskbsdlabel.c:613
+#: fdisk/fdisk.c:1926 fdisk/fdiskbsdlabel.c:617
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:1924
+#: fdisk/fdisk.c:1936
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:1929
+#: fdisk/fdisk.c:1941
#, c-format
msgid ""
"Command action\n"
@@ -2514,30 +2750,30 @@ msgstr ""
" %s\n"
" p primární diskový oddíl (1-4)\n"
-#: fdisk/fdisk.c:1931
+#: fdisk/fdisk.c:1943
msgid "l logical (5 or over)"
msgstr "l logický diskový oddíl (5 nebo více)"
-#: fdisk/fdisk.c:1931
+#: fdisk/fdisk.c:1943
msgid "e extended"
msgstr "e roz¹íøený diskový oddíl"
-#: fdisk/fdisk.c:1948
+#: fdisk/fdisk.c:1960
#, c-format
msgid "Invalid partition number for type `%c'\n"
msgstr "Chybné èíslo diskového oddílu pro typ `%c'.\n"
-#: fdisk/fdisk.c:1984
+#: fdisk/fdisk.c:1996
msgid ""
"The partition table has been altered!\n"
"\n"
msgstr "Tabulka rozdìlení disku byla zmìnìna!\n"
-#: fdisk/fdisk.c:1993
+#: fdisk/fdisk.c:2005
msgid "Calling ioctl() to re-read partition table.\n"
msgstr "Volám ioctl() pro znovunaètení tabulky rozdìlení disku.\n"
-#: fdisk/fdisk.c:2009
+#: fdisk/fdisk.c:2021
#, c-format
msgid ""
"\n"
@@ -2546,7 +2782,7 @@ msgid ""
"The new table will be used at the next reboot.\n"
msgstr ""
-#: fdisk/fdisk.c:2019
+#: fdisk/fdisk.c:2031
msgid ""
"\n"
"WARNING: If you have created or modified any DOS 6.x\n"
@@ -2558,65 +2794,65 @@ 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:2026
+#: fdisk/fdisk.c:2038
msgid "Syncing disks.\n"
msgstr "Synchronizují se disky.\n"
-#: fdisk/fdisk.c:2073
+#: fdisk/fdisk.c:2085
#, c-format
msgid "Partition %d has no data area\n"
msgstr "Diskový oddíl %d neobsahuje datovou oblast.\n"
-#: fdisk/fdisk.c:2078
+#: fdisk/fdisk.c:2090
msgid "New beginning of data"
msgstr "Nový zaèátek dat"
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2106
msgid "Expert command (m for help): "
msgstr "Pøíkaz pro odborníky (m pro nápovìdu): "
-#: fdisk/fdisk.c:2107
+#: fdisk/fdisk.c:2119
msgid "Number of cylinders"
msgstr "Poèet cylindrù"
-#: fdisk/fdisk.c:2134
+#: fdisk/fdisk.c:2146
msgid "Number of heads"
msgstr "Poèet hlav"
-#: fdisk/fdisk.c:2159
+#: fdisk/fdisk.c:2171
msgid "Number of sectors"
msgstr "Poèet sektorù"
-#: fdisk/fdisk.c:2162
+#: fdisk/fdisk.c:2174
msgid "Warning: setting sector offset for DOS compatiblity\n"
msgstr "Varování: nastaven posun sektoru kvùli kompatibilitì s DOSEM\n"
-#: fdisk/fdisk.c:2237
+#: fdisk/fdisk.c:2249
#, c-format
msgid "Disk %s doesn't contain a valid partition table\n"
msgstr "Na disku %s není korektní tabulka rozdìlení disku.\n"
-#: fdisk/fdisk.c:2251
+#: fdisk/fdisk.c:2263
#, c-format
msgid "Cannot open %s\n"
msgstr "%s nelze otevøít.\n"
-#: fdisk/fdisk.c:2267 fdisk/sfdisk.c:2363
+#: fdisk/fdisk.c:2279 fdisk/sfdisk.c:2363
#, c-format
msgid "cannot open %s\n"
msgstr "%s nelze otevøít.\n"
-#: fdisk/fdisk.c:2289
+#: fdisk/fdisk.c:2301
#, c-format
msgid "%c: unknown command\n"
msgstr "pøíkaz %c není znám\n"
-#: fdisk/fdisk.c:2339
+#: fdisk/fdisk.c:2351
msgid "This kernel finds the sector size itself - -b option ignored\n"
msgstr ""
"Toto jádro detekuje velikost sektoru automaticky - pøepínaè -b ignorován\n"
-#: fdisk/fdisk.c:2342
+#: fdisk/fdisk.c:2355
msgid ""
"Warning: the -b (set sector size) option should be used with one specified "
"device\n"
@@ -2625,20 +2861,19 @@ msgstr ""
"jedním\n"
" zadaným zaøízením.\n"
-#: fdisk/fdisk.c:2405
-#, c-format
-msgid ""
-"Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
-"To return to DOS partition table mode, use the 'r' command.\n"
+#. OSF label, and no DOS label
+#: fdisk/fdisk.c:2414
+#, fuzzy, c-format
+msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
msgstr ""
"Na %s nalezen OSF/1 popis disku. Spou¹tím re¾im popisu disku.\n"
"Pro návrat do re¾imu DOS tabulky rozdìlení disku pou¾ijte pøíkaz 'r'.\n"
-#: fdisk/fdisk.c:2413
+#: fdisk/fdisk.c:2424
msgid "Command (m for help): "
msgstr "Pøíkaz (m pro nápovìdu): "
-#: fdisk/fdisk.c:2429
+#: fdisk/fdisk.c:2440
#, c-format
msgid ""
"\n"
@@ -2647,15 +2882,15 @@ msgstr ""
"\n"
"Aktuální startovací soubor: %s\n"
-#: fdisk/fdisk.c:2431
+#: fdisk/fdisk.c:2442
msgid "Please enter the name of the new boot file: "
msgstr "Zadejte název nového startovacího souboru: "
-#: fdisk/fdisk.c:2433
+#: fdisk/fdisk.c:2444
msgid "Boot file unchanged\n"
msgstr "Startovací soubor nebyl zmìnìn.\n"
-#: fdisk/fdisk.c:2497
+#: fdisk/fdisk.c:2508
msgid ""
"\n"
"\tSorry, no experts menu for SGI partition tables available.\n"
@@ -2692,7 +2927,7 @@ msgstr ""
"\t ji¾ není logickou souèástí Va¹eho AIX systému. (Jinak\n"
"\t se z Vás stává AIXpert)."
-#: fdisk/fdiskbsdlabel.c:117
+#: fdisk/fdiskbsdlabel.c:122
#, c-format
msgid ""
"\n"
@@ -2701,170 +2936,170 @@ msgstr ""
"\n"
"BSD tabulka rozdìlení disku pro zaøízení: %s\n"
-#: fdisk/fdiskbsdlabel.c:125
+#: fdisk/fdiskbsdlabel.c:130
msgid " d delete a BSD partition"
msgstr " d smazat BSD diskový oddíl"
-#: fdisk/fdiskbsdlabel.c:126
+#: fdisk/fdiskbsdlabel.c:131
msgid " e edit drive data"
msgstr " e upravovat data na disku"
-#: fdisk/fdiskbsdlabel.c:127
+#: fdisk/fdiskbsdlabel.c:132
msgid " i install bootstrap"
msgstr " i instalovat zavadìè"
-#: fdisk/fdiskbsdlabel.c:128
+#: fdisk/fdiskbsdlabel.c:133
msgid " l list known filesystem types"
msgstr " l vypsat známé typy systémù souborù"
-#: fdisk/fdiskbsdlabel.c:130
+#: fdisk/fdiskbsdlabel.c:135
msgid " n add a new BSD partition"
msgstr " n vytvoøit nový BSD diskový oddíl"
-#: fdisk/fdiskbsdlabel.c:131
+#: fdisk/fdiskbsdlabel.c:136
msgid " p print BSD partition table"
msgstr " p vytisknout BSD tabulku rozdìlení disku"
-#: fdisk/fdiskbsdlabel.c:134
+#: fdisk/fdiskbsdlabel.c:139
msgid " s show complete disklabel"
msgstr " s zobrazí úplný popis disku"
-#: fdisk/fdiskbsdlabel.c:135
+#: fdisk/fdiskbsdlabel.c:140
msgid " t change a partition's filesystem id"
msgstr " t zmìní id systému souborù daného diskového oddílu"
-#: fdisk/fdiskbsdlabel.c:136
+#: fdisk/fdiskbsdlabel.c:141
msgid " u change units (cylinders/sectors)"
msgstr " u zmìní jednotky (cylindry/sektory)"
-#: fdisk/fdiskbsdlabel.c:137
+#: fdisk/fdiskbsdlabel.c:142
msgid " w write disklabel to disk"
msgstr " w ulo¾í popis disku na disk"
-#: fdisk/fdiskbsdlabel.c:139
+#: fdisk/fdiskbsdlabel.c:144
msgid " x link BSD partition to non-BSD partition"
msgstr " x pøipojí BSD diskový oddíl na ne-BSD diskový oddíl"
-#: fdisk/fdiskbsdlabel.c:171
+#: fdisk/fdiskbsdlabel.c:176
#, c-format
msgid "Partition %s has invalid starting sector 0.\n"
msgstr "Diskový oddíl %s má chybný poèáteèní sektor 0.\n"
-#: fdisk/fdiskbsdlabel.c:175
+#: fdisk/fdiskbsdlabel.c:180
#, c-format
msgid "Reading disklabel of %s at sector %d.\n"
msgstr "Ètu popis disku %s v sektoru %d.\n"
-#: fdisk/fdiskbsdlabel.c:185
+#: fdisk/fdiskbsdlabel.c:190
#, c-format
msgid "There is no *BSD partition on %s.\n"
msgstr "Na %s se nenachází ¾ádný *BSD diskový oddíl.\n"
-#: fdisk/fdiskbsdlabel.c:199
+#: fdisk/fdiskbsdlabel.c:204
msgid "BSD disklabel command (m for help): "
msgstr "Pøíkaz pro BSD popis disku (m pro nápovìdu): "
-#: fdisk/fdiskbsdlabel.c:313
+#: fdisk/fdiskbsdlabel.c:318
#, c-format
msgid "type: %s\n"
msgstr "typ: %s\n"
-#: fdisk/fdiskbsdlabel.c:315
+#: fdisk/fdiskbsdlabel.c:320
#, c-format
msgid "type: %d\n"
msgstr "typ: %d\n"
-#: fdisk/fdiskbsdlabel.c:316
+#: fdisk/fdiskbsdlabel.c:321
#, c-format
msgid "disk: %.*s\n"
msgstr "disk: %.*s\n"
-#: fdisk/fdiskbsdlabel.c:317
+#: fdisk/fdiskbsdlabel.c:322
#, c-format
msgid "label: %.*s\n"
msgstr "tabulka: %.*s\n"
-#: fdisk/fdiskbsdlabel.c:318
+#: fdisk/fdiskbsdlabel.c:323
msgid "flags:"
msgstr "pøíznaky:"
-#: fdisk/fdiskbsdlabel.c:320
+#: fdisk/fdiskbsdlabel.c:325
msgid " removable"
msgstr " výmìnný"
# ???
-#: fdisk/fdiskbsdlabel.c:322
+#: fdisk/fdiskbsdlabel.c:327
msgid " ecc"
msgstr " ecc"
-#: fdisk/fdiskbsdlabel.c:324
+#: fdisk/fdiskbsdlabel.c:329
msgid " badsect"
msgstr " chybnýsekt"
#. On various machines the fields of *lp are short/int/long
#. In order to avoid problems, we cast them all to long.
-#: fdisk/fdiskbsdlabel.c:328
+#: fdisk/fdiskbsdlabel.c:333
#, c-format
msgid "bytes/sector: %ld\n"
msgstr "bajtù/sektor: %ld\n"
-#: fdisk/fdiskbsdlabel.c:329
+#: fdisk/fdiskbsdlabel.c:334
#, c-format
msgid "sectors/track: %ld\n"
msgstr "sektorù/stopu: %ld\n"
-#: fdisk/fdiskbsdlabel.c:330
+#: fdisk/fdiskbsdlabel.c:335
#, c-format
msgid "tracks/cylinder: %ld\n"
msgstr "stop/cylindr: %ld\n"
-#: fdisk/fdiskbsdlabel.c:331
+#: fdisk/fdiskbsdlabel.c:336
#, c-format
msgid "sectors/cylinder: %ld\n"
msgstr "sektorù/cylindr: %ld\n"
-#: fdisk/fdiskbsdlabel.c:332
+#: fdisk/fdiskbsdlabel.c:337
#, c-format
msgid "cylinders: %ld\n"
msgstr "cylindrù: %ld\n"
-#: fdisk/fdiskbsdlabel.c:333
+#: fdisk/fdiskbsdlabel.c:338
#, c-format
msgid "rpm: %d\n"
msgstr "otm: %d\n"
# *skew ???
# zde pøeklad spí¹e odhaduji
-#: fdisk/fdiskbsdlabel.c:334
+#: fdisk/fdiskbsdlabel.c:339
#, c-format
msgid "interleave: %d\n"
msgstr "interleave: %d\n"
-#: fdisk/fdiskbsdlabel.c:335
+#: fdisk/fdiskbsdlabel.c:340
#, c-format
msgid "trackskew: %d\n"
msgstr "zakøivení stopy: %d\n"
-#: fdisk/fdiskbsdlabel.c:336
+#: fdisk/fdiskbsdlabel.c:341
#, c-format
msgid "cylinderskew: %d\n"
msgstr "zakøivení cylindru: %d\n"
-#: fdisk/fdiskbsdlabel.c:337
+#: fdisk/fdiskbsdlabel.c:342
#, c-format
msgid "headswitch: %ld\t\t# milliseconds\n"
msgstr "pøesun hlavy: %ld\t\t# milisekund\n"
-#: fdisk/fdiskbsdlabel.c:339
+#: fdisk/fdiskbsdlabel.c:344
#, c-format
msgid "track-to-track seek: %ld\t# milliseconds\n"
msgstr "posun stopa-stopa: %ld\t# milisekund\n"
-#: fdisk/fdiskbsdlabel.c:341
+#: fdisk/fdiskbsdlabel.c:346
msgid "drivedata: "
msgstr "diskdata: "
-#: fdisk/fdiskbsdlabel.c:350
+#: fdisk/fdiskbsdlabel.c:355
#, c-format
msgid ""
"\n"
@@ -2873,97 +3108,97 @@ msgstr ""
"\n"
"poèet diskových oddílù - %d:\n"
-#: fdisk/fdiskbsdlabel.c:351
+#: fdisk/fdiskbsdlabel.c:356
msgid "# start end size fstype [fsize bsize cpg]\n"
msgstr "# velik konec velikost sstyp [fsize bsize cpg]\n"
-#: fdisk/fdiskbsdlabel.c:400 fdisk/fdiskbsdlabel.c:403
+#: fdisk/fdiskbsdlabel.c:405 fdisk/fdiskbsdlabel.c:408
#, c-format
msgid "Writing disklabel to %s.\n"
msgstr "Ukládám popis disku na %s.\n"
-#: fdisk/fdiskbsdlabel.c:415 fdisk/fdiskbsdlabel.c:417
+#: fdisk/fdiskbsdlabel.c:420 fdisk/fdiskbsdlabel.c:422
#, c-format
msgid "%s contains no disklabel.\n"
msgstr "Na %s se nenachází ¾ádný popis disku.\n"
-#: fdisk/fdiskbsdlabel.c:422
+#: fdisk/fdiskbsdlabel.c:427
msgid "Do you want to create a disklabel? (y/n) "
msgstr "Chcete vytvoøit popis disku? (y/n)"
-#: fdisk/fdiskbsdlabel.c:461
+#: fdisk/fdiskbsdlabel.c:466
msgid "bytes/sector"
msgstr "bajtù/sektor"
-#: fdisk/fdiskbsdlabel.c:462
+#: fdisk/fdiskbsdlabel.c:467
msgid "sectors/track"
msgstr "sektorù/stopu"
-#: fdisk/fdiskbsdlabel.c:463
+#: fdisk/fdiskbsdlabel.c:468
msgid "tracks/cylinder"
msgstr "stop/cylindr"
-#: fdisk/fdiskbsdlabel.c:471
+#: fdisk/fdiskbsdlabel.c:476
msgid "sectors/cylinder"
msgstr "sektorù/cylindr"
-#: fdisk/fdiskbsdlabel.c:475
+#: fdisk/fdiskbsdlabel.c:480
msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
msgstr "Musí být <= sektorù/stopu * stop/cylindr (implicitní).\n"
-#: fdisk/fdiskbsdlabel.c:477
+#: fdisk/fdiskbsdlabel.c:482
msgid "rpm"
msgstr "otm"
-#: fdisk/fdiskbsdlabel.c:478
+#: fdisk/fdiskbsdlabel.c:483
msgid "interleave"
msgstr "interleave"
-#: fdisk/fdiskbsdlabel.c:479
+#: fdisk/fdiskbsdlabel.c:484
msgid "trackskew"
msgstr "zakøivení stopy"
-#: fdisk/fdiskbsdlabel.c:480
+#: fdisk/fdiskbsdlabel.c:485
msgid "cylinderskew"
msgstr "zakøivení cylindru"
-#: fdisk/fdiskbsdlabel.c:481
+#: fdisk/fdiskbsdlabel.c:486
msgid "headswitch"
msgstr "pøesun hlavy"
-#: fdisk/fdiskbsdlabel.c:482
+#: fdisk/fdiskbsdlabel.c:487
msgid "track-to-track seek"
msgstr "posun stopa-stopa"
-#: fdisk/fdiskbsdlabel.c:523
+#: fdisk/fdiskbsdlabel.c:528
#, c-format
msgid "Bootstrap: %sboot -> boot%s (%s): "
msgstr "Zavadìè: %sstart -> start%s (%s): "
-#: fdisk/fdiskbsdlabel.c:548
+#: fdisk/fdiskbsdlabel.c:553
msgid "Bootstrap overlaps with disk label!\n"
msgstr "Zavadìè pøesahuje do tabulky rozdìlení disku!\n"
-#: fdisk/fdiskbsdlabel.c:569 fdisk/fdiskbsdlabel.c:571
+#: fdisk/fdiskbsdlabel.c:574 fdisk/fdiskbsdlabel.c:576
#, c-format
msgid "Bootstrap installed on %s.\n"
msgstr "Zavadìè instalován na %s.\n"
-#: fdisk/fdiskbsdlabel.c:593
+#: fdisk/fdiskbsdlabel.c:598
#, c-format
msgid "Partition (a-%c): "
msgstr "Diskový oddíl (a-%c): "
-#: fdisk/fdiskbsdlabel.c:624
+#: fdisk/fdiskbsdlabel.c:629
msgid "This partition already exists.\n"
msgstr "Tento diskový oddíl ji¾ existuje.\n"
-#: fdisk/fdiskbsdlabel.c:744
+#: fdisk/fdiskbsdlabel.c:755
#, 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:791
+#: fdisk/fdiskbsdlabel.c:803
msgid ""
"\n"
"Syncing disks.\n"
@@ -4906,138 +5141,124 @@ msgstr "getopt (roz¹íøené) 1.1.2\n"
msgid "internal error, contact the author."
msgstr "Vnitøní chyba, oznamte ji autorovi."
-#: hwclock/cmos.c:168
+#: hwclock/cmos.c:172
msgid "booted from MILO\n"
msgstr "spu¹tìn pomocí MILO\n"
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:181
msgid "Ruffian BCD clock\n"
msgstr "hodnoty ulo¾eny v BCD tvaru\n"
-#: hwclock/cmos.c:193
+#: hwclock/cmos.c:197
#, c-format
msgid "clockport adjusted to 0x%x\n"
msgstr "vstupnì/výstupní port pro pøístup k hodinám nastaven na 0x%x\n"
-#: hwclock/cmos.c:205
+#: hwclock/cmos.c:209
msgid "funky TOY!\n"
msgstr "pou¾it pøepínaè --funky-toy!\n"
-#: hwclock/cmos.c:259
+#: hwclock/cmos.c:263
#, c-format
msgid "%s: atomic %s failed for 1000 iterations!"
msgstr "%s: 1000 neúspì¹ných pokusù o atomické provedení %s!"
-#: hwclock/cmos.c:583
+#: hwclock/cmos.c:587
#, c-format
msgid "Cannot open /dev/port: %s"
msgstr "/dev/port nelze otevøít: %s"
-#: hwclock/cmos.c:590
+#: hwclock/cmos.c:594
msgid "I failed to get permission because I didn't try.\n"
msgstr "Jeliko¾ jsem se nesna¾il, nepodaøilo se mi získat práva pro pøístup.\n"
-#: hwclock/cmos.c:593
+#: hwclock/cmos.c:597
#, c-format
msgid "%s is unable to get I/O port access: the iopl(3) call failed.\n"
msgstr "%s: pøístup k portu nelze získat: volání iopl(3) selhalo.\n"
-#: hwclock/cmos.c:596
+#: hwclock/cmos.c:600
msgid "Probably you need root privileges.\n"
msgstr "Pravdìpodobnì je tøeba mít práva superu¾ivatele.\n"
-#: hwclock/hwclock.c:219
+#: hwclock/hwclock.c:223
#, c-format
msgid "Assuming hardware clock is kept in %s time.\n"
msgstr "Pøedpokládám, ¾e hodiny reálného èasu jsou nastaveny na %s èas.\n"
-#: hwclock/hwclock.c:220 hwclock/hwclock.c:314
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
msgid "UTC"
msgstr "greenwichský"
-#: hwclock/hwclock.c:220 hwclock/hwclock.c:313
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
msgid "local"
msgstr "místní"
-#: hwclock/hwclock.c:297
+#: hwclock/hwclock.c:303
#, c-format
msgid "%s: Warning: unrecognized third line in adjtime file\n"
msgstr "%s: Varování: neznámý formát tøetího øádku v souboru adjtime\n"
-#: hwclock/hwclock.c:299
+#: hwclock/hwclock.c:305
msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
msgstr "(Oèekáváno `UTC', `LOCAL' èi nic.)\n"
-#: hwclock/hwclock.c:308
+#: hwclock/hwclock.c:312
#, c-format
msgid "Last drift adjustment done at %ld seconds after 1969\n"
msgstr "Poslední oprava posunu probìhla %ld sekund od roku 1969.\n"
-#: hwclock/hwclock.c:310
+#: hwclock/hwclock.c:314
#, c-format
msgid "Last calibration done at %ld seconds after 1969\n"
msgstr "Poslední kalibrace probìhla %ld sekund od roku 1969.\n"
-#: hwclock/hwclock.c:312
+#: hwclock/hwclock.c:316
#, c-format
msgid "Hardware clock is on %s time\n"
msgstr "Hodiny reálného èasu jsou nastaveny na %s èas.\n"
-#: hwclock/hwclock.c:314
+#: hwclock/hwclock.c:318
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
-#. 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.
-#.
-#. -----------------------------------------------------------------------------
-#: hwclock/hwclock.c:336
+#: hwclock/hwclock.c:342
msgid "Waiting for clock tick...\n"
msgstr "èekám na tiknutí hodin...\n"
-#: hwclock/hwclock.c:340
+#: hwclock/hwclock.c:346
msgid "...got clock tick\n"
msgstr "...hodiny tikly\n"
-#: hwclock/hwclock.c:391
+#: hwclock/hwclock.c:399
#, c-format
msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
msgstr ""
"Hodiny reálného èasu obsahují chybné hodnoty: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
-#: hwclock/hwclock.c:399
+#: hwclock/hwclock.c:407
#, c-format
msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
msgstr ""
"Hodiny reálného èasu: %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld sekund od roku "
"1969\n"
-#: hwclock/hwclock.c:427
+#: hwclock/hwclock.c:435
#, c-format
msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
msgstr "Hodiny reálného èasu ukazují %4d/%.2d/%.2d %02d:%02d:%02d\n"
-#: hwclock/hwclock.c:454
+#: hwclock/hwclock.c:462
#, c-format
msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
msgstr ""
"Nastavuji hodiny reálného èasu na %.2d:%.2d:%.2d = %ld sekund od roku 1969\n"
-#: hwclock/hwclock.c:460
+#: hwclock/hwclock.c:468
msgid "Clock not changed - testing only.\n"
msgstr "Testovací re¾im - Èas nezmìnìn.\n"
-#: hwclock/hwclock.c:508
+#: hwclock/hwclock.c:516
#, c-format
msgid ""
"Time elapsed since reference time has been %.6f seconds.\n"
@@ -5046,7 +5267,7 @@ msgstr ""
"Poèet sekund uplynulých od referenèního èasu: %.6f.\n"
"Èekám, dokud neuplyne dal¹í celá sekunda.\n"
-#: hwclock/hwclock.c:532
+#: hwclock/hwclock.c:540
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"
@@ -5054,42 +5275,42 @@ msgstr ""
"Registry hodin reálného èasu obsahují hodnoty, které jsou buï chybné (napø.\n"
"50tý den v mìsíci), èi mimo pøípustný rozsah (napø. rok 2095).\n"
-#: hwclock/hwclock.c:542
+#: hwclock/hwclock.c:550
#, c-format
msgid "%s %.6f seconds\n"
msgstr "%s %.6f sekundy\n"
-#: hwclock/hwclock.c:576
+#: hwclock/hwclock.c:584
msgid "No --date option specified.\n"
msgstr "Pøepínaè --date vy¾aduje argument.\n"
-#: hwclock/hwclock.c:582
+#: hwclock/hwclock.c:590
#, fuzzy
msgid "--date argument too long\n"
msgstr "název ss je pøíli¹ dlouhý"
-#: hwclock/hwclock.c:589
+#: hwclock/hwclock.c:597
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"
-#: hwclock/hwclock.c:597
+#: hwclock/hwclock.c:605
#, c-format
msgid "Issuing date command: %s\n"
msgstr "Spou¹tím pøíkaz 'date': %s\n"
-#: hwclock/hwclock.c:601
+#: hwclock/hwclock.c:609
msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
msgstr "Pøíkaz 'date' nelze v shellu /bin/sh spustit. Volání popen() selhalo."
-#: hwclock/hwclock.c:609
+#: hwclock/hwclock.c:617
#, c-format
msgid "response from date command = %s\n"
msgstr "odpovìï pøíkazu 'date' = %s\n"
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:619
#, c-format
msgid ""
"The date command issued by %s returned unexpected results.\n"
@@ -5104,7 +5325,7 @@ msgstr ""
"Odpovìï:\n"
" %s\n"
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:631
#, c-format
msgid ""
"The date command issued by %s returned something other than an integer where "
@@ -5121,12 +5342,12 @@ msgstr ""
"Odpovìï:\n"
" %s\n"
-#: hwclock/hwclock.c:634
+#: hwclock/hwclock.c:642
#, c-format
msgid "date string %s equates to %ld seconds since 1969.\n"
msgstr "Datum %s odpovídá %ld sekundám od roku 1969.\n"
-#: hwclock/hwclock.c:666
+#: hwclock/hwclock.c:674
msgid ""
"The Hardware Clock does not contain a valid time, so we cannot set the "
"System Time from it.\n"
@@ -5134,33 +5355,33 @@ msgstr ""
"Systémový èas nelze podle hodin reálného èasu nastavit, proto¾e neukazují\n"
"platný èas.\n"
-#: hwclock/hwclock.c:688
+#: hwclock/hwclock.c:696
msgid "Calling settimeofday:\n"
msgstr "Volám settimeofday:\n"
-#: hwclock/hwclock.c:689
+#: hwclock/hwclock.c:697
#, c-format
msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
-#: hwclock/hwclock.c:691
+#: hwclock/hwclock.c:699
#, c-format
msgid "\ttz.tz_minuteswest = %d\n"
msgstr "\ttz.tz_minuteswest = %d\n"
-#: hwclock/hwclock.c:694
+#: hwclock/hwclock.c:702
msgid "Not setting system clock because running in test mode.\n"
msgstr "Testovací re¾im - systémový èas nezmìnìn.\n"
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:711
msgid "Must be superuser to set system clock.\n"
msgstr "Nastavit systémový èas mù¾e pouze superu¾ivatel.\n"
-#: hwclock/hwclock.c:704
+#: hwclock/hwclock.c:714
msgid "settimeofday() failed"
msgstr "volání settimeofday() selhalo"
-#: hwclock/hwclock.c:737
+#: hwclock/hwclock.c:744
msgid ""
"Not adjusting drift factor because the Hardware Clock previously contained "
"garbage.\n"
@@ -5168,7 +5389,16 @@ msgstr ""
"Neopravuji míru posunu, proto¾e hodiny reálného èasu poslednì obsahovaly\n"
"neplatné hodnoty.\n"
-#: hwclock/hwclock.c:741
+#: hwclock/hwclock.c:749
+#, fuzzy
+msgid ""
+"Not adjusting drift factor because last calibration time is zero,\n"
+"so history is bad and calibration startover is necessary.\n"
+msgstr ""
+"Neopravuji míru posunu, proto¾e poslední kalibrace je¹tì neuplynul celý "
+"den.\n"
+
+#: hwclock/hwclock.c:755
msgid ""
"Not adjusting drift factor because it has been less than a day since the "
"last calibration.\n"
@@ -5176,10 +5406,10 @@ msgstr ""
"Neopravuji míru posunu, proto¾e poslední kalibrace je¹tì neuplynul celý "
"den.\n"
-#: hwclock/hwclock.c:750
-#, c-format
+#: hwclock/hwclock.c:803
+#, fuzzy, c-format
msgid ""
-"Clock drifted %d seconds in the past %d seconds in spite of a drift factor "
+"Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
"of %f seconds/day.\n"
"Adjusting drift factor by %f seconds/day\n"
msgstr ""
@@ -5188,21 +5418,21 @@ msgstr ""
"je nastavena na %3$f sekund/den.\n"
"Opravuji míru posunu o %4$f sekund.\n"
-#: hwclock/hwclock.c:801
+#: hwclock/hwclock.c:854
#, c-format
msgid "Time since last adjustment is %d seconds\n"
msgstr "Poèet sekund od poslední opravy: %d\n"
-#: hwclock/hwclock.c:803
+#: hwclock/hwclock.c:856
#, c-format
msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
msgstr "Potøebná zmìna èasu: sekund vpøed: %d ; sekund zpìt: %.6f\n"
-#: hwclock/hwclock.c:832
+#: hwclock/hwclock.c:885
msgid "Not updating adjtime file because of testing mode.\n"
msgstr "Testovací re¾im - soubor adjtime nezmìnìn.\n"
-#: hwclock/hwclock.c:833
+#: hwclock/hwclock.c:886
#, c-format
msgid ""
"Would have written the following to %s:\n"
@@ -5211,33 +5441,33 @@ msgstr ""
"Do %s by bylo ulo¾eno následující:\n"
"%s"
-#: hwclock/hwclock.c:857
+#: hwclock/hwclock.c:910
msgid "Drift adjustment parameters not updated.\n"
msgstr "Parametry opravy posunu nezmìnìny.\n"
-#: hwclock/hwclock.c:898
+#: hwclock/hwclock.c:951
msgid ""
"The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
msgstr "Hodiny reálného èasu obsahují neplatný èas, tudí¾ jej nelze opravit.\n"
-#: hwclock/hwclock.c:922
+#: hwclock/hwclock.c:983
msgid "Needed adjustment is less than one second, so not setting clock.\n"
msgstr "Potøebná oprava je men¹í ne¾ 1 sekunda, proto hodiny nenastavuji.\n"
-#: hwclock/hwclock.c:948
+#: hwclock/hwclock.c:1009
#, c-format
msgid "Using %s.\n"
msgstr "Pou¾ívám %s.\n"
-#: hwclock/hwclock.c:950
+#: hwclock/hwclock.c:1011
msgid "No usable clock interface found.\n"
msgstr "Nebylo nalezeno ¾ádné pou¾itelné rozhraní k hodinám.\n"
-#: hwclock/hwclock.c:1045
+#: hwclock/hwclock.c:1107
msgid "Unable to set system clock.\n"
msgstr "Systémový èas nelze nastavit.\n"
-#: hwclock/hwclock.c:1076
+#: hwclock/hwclock.c:1137
msgid ""
"The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
"machine.\n"
@@ -5250,31 +5480,31 @@ msgstr ""
"Tento program nebyl pøelo¾en pro Alpha systém ( a tudí¾ pravdìpodobnì nyní\n"
"nebì¾í na Alphì). Ignorováno.\n"
-#: hwclock/hwclock.c:1085
+#: hwclock/hwclock.c:1146
msgid "Unable to get the epoch value from the kernel.\n"
msgstr "Poèátek epochy nelze z jádra zjistit.\n"
-#: hwclock/hwclock.c:1087
+#: hwclock/hwclock.c:1148
#, c-format
msgid "Kernel is assuming an epoch value of %lu\n"
msgstr "Jádro pokládá za poèátek epochy %lu.\n"
-#: hwclock/hwclock.c:1090
+#: hwclock/hwclock.c:1151
msgid ""
"To set the epoch value, you must use the 'epoch' option to tell to what "
"value to set it.\n"
msgstr "Poèátek epochy nastavíte pomocí pøepínaèù epoch a setepoch.\n"
-#: hwclock/hwclock.c:1093
+#: hwclock/hwclock.c:1154
#, c-format
msgid "Not setting the epoch to %d - testing only.\n"
msgstr "Testovací re¾im - poèátek epochy na %d nemìním.\n"
-#: hwclock/hwclock.c:1096
+#: hwclock/hwclock.c:1157
msgid "Unable to set the epoch value in the kernel.\n"
msgstr "Hodnotu poèátku epochy v jádøe nelze nastavit.\n"
-#: hwclock/hwclock.c:1125
+#: hwclock/hwclock.c:1191
#, fuzzy, c-format
msgid ""
"hwclock - query and set the hardware clock (RTC)\n"
@@ -5330,7 +5560,7 @@ msgstr ""
" --date èas, na který budou nastaveny hodiny reálného èasu\n"
" --epoch=ROK nastaví poèátek epochy pro hodiny reálného èasu na ROK\n"
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1218
msgid ""
" --jensen, --arc, --srm, --funky-toy\n"
" tell hwclock the type of alpha you have (see hwclock(8))\n"
@@ -5338,157 +5568,153 @@ msgstr ""
" --jensen, --arc, --srm, --funky-toy\n"
" nastaví typ alpha systému (viz hwclock(8))\n"
-#: hwclock/hwclock.c:1257
+#: hwclock/hwclock.c:1392
#, c-format
msgid "%s takes no non-option arguments. You supplied %d.\n"
msgstr ""
"%s akceptuje pouze pøepínaèe. Zadáno argumentù, které nejsou pøepínaèi: %d\n"
-#: hwclock/hwclock.c:1267
+#: hwclock/hwclock.c:1398
+#, fuzzy
msgid ""
-"You have specified multiple function options.\n"
+"You have specified multiple functions.\n"
"You can only perform one function at a time.\n"
msgstr ""
"Zadal jste vícero funkèních pøepínaèù. Program mù¾e provést maximálnì jednu\n"
"funkci najednou.\n"
-#: hwclock/hwclock.c:1273
+#: hwclock/hwclock.c:1405
#, c-format
msgid ""
"%s: The --utc and --localtime options are mutually exclusive. You specified "
"both.\n"
msgstr "%s: Pøepínaèe --utc a --localtime nelze pou¾ít zároveò.\n"
-#: hwclock/hwclock.c:1279
+#: hwclock/hwclock.c:1412
#, fuzzy, c-format
msgid ""
"%s: The --adjust and --noadjfile options are mutually exclusive. You "
"specified both.\n"
msgstr "%s: Pøepínaèe --utc a --localtime nelze pou¾ít zároveò.\n"
-#: hwclock/hwclock.c:1285
+#: hwclock/hwclock.c:1419
#, c-format
msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
msgstr ""
-#: hwclock/hwclock.c:1298
+#: hwclock/hwclock.c:1433
msgid "No usable set-to time. Cannot set clock.\n"
msgstr "Nebyl zadán platný èas, který mám nastavit. Hodiny nelze nastavit.\n"
-#: hwclock/hwclock.c:1313
+#: hwclock/hwclock.c:1449
msgid "Sorry, only the superuser can change the Hardware Clock.\n"
msgstr "Hodiny reálného èasu mù¾e nastavit pouze superu¾ivatel.\n"
-#: hwclock/hwclock.c:1317
+#: hwclock/hwclock.c:1454
msgid "Sorry, only the superuser can change the System Clock.\n"
msgstr "Hodiny reálného èasu mù¾e nastavit pouze superu¾ivatel.\n"
-#: hwclock/hwclock.c:1321
+#: hwclock/hwclock.c:1459
msgid ""
"Sorry, only the superuser can change the Hardware Clock epoch in the "
"kernel.\n"
msgstr "Hodnotu poèátku epochy v jádøe mù¾e nastavit pouze superu¾ivatel.\n"
-#: hwclock/hwclock.c:1341
+#: hwclock/hwclock.c:1479
msgid "Cannot access the Hardware Clock via any known method.\n"
msgstr ""
"®ádným ze známých zpùsobù nelze získat pøístup k hodinám reálného èasu.\n"
-#: hwclock/hwclock.c:1344
+#: hwclock/hwclock.c:1483
msgid ""
"Use the --debug option to see the details of our search for an access "
"method.\n"
msgstr "Pro zji¹tìní podrobností pou¾ijte pøepínaè --debug.\n"
-#: hwclock/kd.c:42
+#: hwclock/kd.c:43
msgid "Waiting in loop for time from KDGHWCLK to change\n"
msgstr "Ve smyèce se pokou¹ím zjistit èas pomocí KDGHWCLK.\n"
-#: hwclock/kd.c:45
+#: hwclock/kd.c:46
msgid "KDGHWCLK ioctl to read time failed"
msgstr "volání KDGHWCLK ioctl selhalo."
-#: hwclock/kd.c:66 hwclock/rtc.c:174
+#: hwclock/kd.c:67 hwclock/rtc.c:187
msgid "Timed out waiting for time change.\n"
msgstr "V Èasovém limitu se nepodaøilo zjistit èas.\n"
-#: hwclock/kd.c:70
+#: hwclock/kd.c:71
msgid "KDGHWCLK ioctl to read time failed in loop"
msgstr "volání KDGHWCLK ioctl ve smyèce selhalo."
-#: hwclock/kd.c:92
+#: hwclock/kd.c:93
#, c-format
msgid "ioctl() failed to read time from %s"
msgstr "èas se pomocí volání ioctl() pro %s nepodaøilo zjistit"
-#: hwclock/kd.c:128
+#: hwclock/kd.c:129
msgid "ioctl KDSHWCLK failed"
msgstr "volání ioctl KDSHWCLK selhalo"
-#: hwclock/kd.c:165
+#: hwclock/kd.c:166
msgid "Can't open /dev/tty1 or /dev/vc/1"
msgstr "/dev/tty1 ani /dev/vc/1 nelze otevøít"
-#: hwclock/kd.c:170
+#: hwclock/kd.c:171
msgid "KDGHWCLK ioctl failed"
msgstr "volání ioctl KDGHWCLK selhalo"
-#: hwclock/rtc.c:136
+#: hwclock/rtc.c:115 hwclock/rtc.c:208
+#, c-format
+msgid "open() of %s failed"
+msgstr "%s nelze otevøít - volání open() selhalo"
+
+#: hwclock/rtc.c:149
#, c-format
msgid "ioctl() to %s to read the time failed.\n"
msgstr "èas se pomocí volání ioctl() pro %s nepodaøilo zjistit\n"
-#: hwclock/rtc.c:158
+#: hwclock/rtc.c:171
#, c-format
msgid "Waiting in loop for time from %s to change\n"
msgstr "Èekám ve smyèce na zmìnu èasu z %s\n"
-#: hwclock/rtc.c:195 hwclock/rtc.c:250
-#, c-format
-msgid "open() of %s failed"
-msgstr "%s nelze otevøít - volání open() selhalo"
-
-#: hwclock/rtc.c:213
+#: hwclock/rtc.c:226
#, c-format
msgid "%s does not have interrupt functions. "
msgstr "%s nemá pøeru¹ovací funkce. "
-#: hwclock/rtc.c:222
+#: hwclock/rtc.c:235
#, c-format
msgid "read() to %s to wait for clock tick failed"
msgstr "tikání hodin nelze z %s èíst - volání read() selhalo"
-#: hwclock/rtc.c:231
+#: hwclock/rtc.c:244
#, c-format
msgid "ioctl() to %s to turn off update interrupts failed"
msgstr "obnovovací pøeru¹ení nelze vypnout - volání ioctl() pro %s selhalo"
-#: hwclock/rtc.c:234
+#: hwclock/rtc.c:247
#, c-format
msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
msgstr "obnovovací pøeru¹ení nelze zapnout - volání ioctl() pro %s selhalo"
-#: hwclock/rtc.c:274 hwclock/rtc.c:358 hwclock/rtc.c:404
-#, c-format
-msgid "Unable to open %s"
-msgstr "%s nelze otevøít"
-
-#: hwclock/rtc.c:300
+#: hwclock/rtc.c:306
#, c-format
msgid "ioctl() to %s to set the time failed.\n"
msgstr "Èas nelze nastavit - volání ioctl() pro %s selhalo.\n"
-#: hwclock/rtc.c:306
+#: hwclock/rtc.c:312
#, c-format
msgid "ioctl(%s) was successful.\n"
msgstr "Volání ioctl(%s) bylo úspì¹né.\n"
-#: hwclock/rtc.c:335
+#: hwclock/rtc.c:341
#, c-format
msgid "Open of %s failed"
msgstr "%s nelze otevøít."
-#: hwclock/rtc.c:353 hwclock/rtc.c:399
+#: hwclock/rtc.c:359 hwclock/rtc.c:405
#, c-format
msgid ""
"To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
@@ -5499,12 +5725,17 @@ msgstr ""
"pomocí\n"
"zvlá¹tního souboru %s. Tento soubor na tomto systému souborù neexistuje.\n"
-#: hwclock/rtc.c:365
+#: hwclock/rtc.c:364 hwclock/rtc.c:410
+#, c-format
+msgid "Unable to open %s"
+msgstr "%s nelze otevøít"
+
+#: hwclock/rtc.c:371
#, c-format
msgid "ioctl(RTC_EPOCH_READ) to %s failed"
msgstr "volání(RTC_EPOCH_READ) pro %s selhalo"
-#: hwclock/rtc.c:371
+#: hwclock/rtc.c:377
#, c-format
msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
msgstr ""
@@ -5513,58 +5744,28 @@ msgstr ""
#. kernel would not accept this epoch value
#. Hmm - bad habit, deciding not to do what the user asks
#. just because one believes that the kernel might not like it.
-#: hwclock/rtc.c:391
+#: hwclock/rtc.c:397
#, c-format
msgid "The epoch value may not be less than 1900. You requested %ld\n"
msgstr "Hodnota poèátku epochy nesmí být men¹í ne¾ 1900 (po¾adováno %ld).\n"
-#: hwclock/rtc.c:409
+#: hwclock/rtc.c:415
#, c-format
msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
msgstr ""
"Nastavuji pomocí RTC_EPOCH_SET ioctl pro %2$s poèátek epochy na %1$ld.\n"
-#: hwclock/rtc.c:414
+#: hwclock/rtc.c:420
#, c-format
msgid ""
"The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
msgstr "Ovladaè jádra pro %s nepodporuje RTC_EPOCH_SET ioctl.\n"
-#: hwclock/rtc.c:417
+#: hwclock/rtc.c:423
#, c-format
msgid "ioctl(RTC_EPOCH_SET) to %s failed"
msgstr "volání ioctl(RTC_EPOCH_SET) pro %s selhalo"
-#: hwclock/shhopt.c:255 hwclock/shhopt.c:281
-#, c-format
-msgid "invalid number `%s'\n"
-msgstr "Chybné èíslo `%s'\n"
-
-#: hwclock/shhopt.c:258 hwclock/shhopt.c:284
-#, c-format
-msgid "number `%s' to `%s' out of range\n"
-msgstr "Èíslo `%s' na `%s'. Hodnota je mimo meze.\n"
-
-#: hwclock/shhopt.c:398
-#, c-format
-msgid "unrecognized option `%s'\n"
-msgstr "neznámý pøepínaè `%s'\n"
-
-#: hwclock/shhopt.c:411 hwclock/shhopt.c:449
-#, c-format
-msgid "option `%s' requires an argument\n"
-msgstr "pøepínaè `%s' vy¾aduje argument\n"
-
-#: hwclock/shhopt.c:417
-#, c-format
-msgid "option `%s' doesn't allow an argument\n"
-msgstr "pøepínaè `%s' musí být zadán bez argumentu\n"
-
-#: hwclock/shhopt.c:439
-#, c-format
-msgid "unrecognized option `-%c'\n"
-msgstr "neznámý pøepínaè `-%c'\n"
-
#: login-utils/agetty.c:312
msgid "calling open_tty\n"
msgstr "volám open_tty\n"
@@ -6597,7 +6798,7 @@ msgstr "adresáø nelze otevøít\n"
msgid "fork failed\n"
msgstr "volání fork selhalo\n"
-#: login-utils/simpleinit.c:512 text-utils/more.c:1705
+#: login-utils/simpleinit.c:512 text-utils/more.c:1706
msgid "exec failed\n"
msgstr "volání exec selhalo\n"
@@ -7388,159 +7589,159 @@ msgstr "[mntent]: øádek %d v %s je chybný%s\n"
msgid "; rest of file ignored"
msgstr "; ignoruji zbytek souboru"
-#: mount/mount.c:379
+#: mount/mount.c:381
#, 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:383
+#: mount/mount.c:385
#, 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:404
+#: mount/mount.c:406
#, c-format
msgid "mount: can't open %s for writing: %s"
msgstr "mount: %s nelze otevøít pro zápis: %s"
-#: mount/mount.c:419 mount/mount.c:638
+#: mount/mount.c:421 mount/mount.c:640
#, c-format
msgid "mount: error writing %s: %s"
msgstr "mount: chyba pøi zápisu %s: %s"
-#: mount/mount.c:426
+#: mount/mount.c:428
#, c-format
msgid "mount: error changing mode of %s: %s"
msgstr "mount: chyba pøi zmìnì módu %s: %s"
-#: mount/mount.c:472
+#: mount/mount.c:474
#, c-format
msgid "%s looks like swapspace - not mounted"
msgstr "%s vypadá jako odkládací prostor - nepøipojeno"
-#: mount/mount.c:532
+#: mount/mount.c:534
msgid "mount failed"
msgstr "pøipojení se nezdaøilo"
-#: mount/mount.c:534
+#: mount/mount.c:536
#, 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:562
+#: mount/mount.c:564
msgid "mount: loop device specified twice"
msgstr "mount: zaøízení loop bylo zadáno dvakrát"
-#: mount/mount.c:567
+#: mount/mount.c:569
msgid "mount: type specified twice"
msgstr "mount: typ byl zadán dvakrát"
-#: mount/mount.c:579
+#: mount/mount.c:581
msgid "mount: skipping the setup of a loop device\n"
msgstr "mount: pøeskakuji nastavení loop zaøízení\n"
-#: mount/mount.c:588
+#: mount/mount.c:590
#, 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:592
+#: mount/mount.c:594
msgid "mount: failed setting up loop device\n"
msgstr "mount: nepodaøilo se nastavit zaøízení loop\n"
-#: mount/mount.c:596
+#: mount/mount.c:598
msgid "mount: setup loop device successfully\n"
msgstr "mount: zaøízení loop bylo korektnì nastaveno\n"
-#: mount/mount.c:633
+#: mount/mount.c:635
#, c-format
msgid "mount: can't open %s: %s"
msgstr "mount: %s nelze otevøít: %s"
-#: mount/mount.c:656
+#: mount/mount.c:658
#, fuzzy, c-format
msgid "mount: cannot open %s for setting speed"
msgstr "mount: %s nelze pro nastavení rychlosti otevøít"
-#: mount/mount.c:659
+#: mount/mount.c:661
#, c-format
msgid "mount: cannot set speed: %s"
msgstr "mount: rychlost nelze nastavit: %s"
-#: mount/mount.c:720 mount/mount.c:1265
+#: mount/mount.c:722 mount/mount.c:1295
#, c-format
msgid "mount: cannot fork: %s"
msgstr "mount: volání fork selhalo: %s"
-#: mount/mount.c:800
+#: mount/mount.c:802
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:839
+#: mount/mount.c:841
msgid "mount: failed with nfs mount version 4, trying 3..\n"
msgstr "mount: chyba s nfs mount verze 4, zkou¹ím verzi 3..\n"
-#: mount/mount.c:850
+#: mount/mount.c:852
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:853
+#: mount/mount.c:855
msgid "mount: you must specify the filesystem type"
msgstr "mount: musíte zadat typ systému souborù"
#. should not happen
-#: mount/mount.c:856
+#: mount/mount.c:858
msgid "mount: mount failed"
msgstr "mount: pøipojení se nezdaøilo"
-#: mount/mount.c:862 mount/mount.c:897
+#: mount/mount.c:864 mount/mount.c:899
#, c-format
msgid "mount: mount point %s is not a directory"
msgstr "mount: pøípojný bod %s není adresáøem"
-#: mount/mount.c:864
+#: mount/mount.c:866
msgid "mount: permission denied"
msgstr "mount: pøístup odmítnut"
-#: mount/mount.c:866
+#: mount/mount.c:868
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:870 mount/mount.c:874
+#: mount/mount.c:872 mount/mount.c:876
#, c-format
msgid "mount: %s is busy"
msgstr "mount: %s je ji¾ pøipojeno"
#. no
#. yes, don't mention it
-#: mount/mount.c:876
+#: mount/mount.c:878
msgid "mount: proc already mounted"
msgstr "mount: proc je ji¾ pøipojeno"
-#: mount/mount.c:878
+#: mount/mount.c:880
#, 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:884
+#: mount/mount.c:886
#, c-format
msgid "mount: mount point %s does not exist"
msgstr "mount: pøípojný bod %s neexistuje"
-#: mount/mount.c:886
+#: mount/mount.c:888
#, 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:889
+#: mount/mount.c:891
#, c-format
msgid "mount: special device %s does not exist"
msgstr "mount: speciální zaøízení %s neexistuje"
-#: mount/mount.c:899
+#: mount/mount.c:901
#, c-format
msgid ""
"mount: special device %s does not exist\n"
@@ -7549,12 +7750,12 @@ msgstr ""
"mount: speciální zaøízení %s neexistuje\n"
" (název cesty nezaèíná adresáøem)\n"
-#: mount/mount.c:912
+#: mount/mount.c:914
#, 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:914
+#: mount/mount.c:916
#, c-format
msgid ""
"mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -7563,46 +7764,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:948
+#: mount/mount.c:950
msgid "mount table full"
msgstr "tabulka pøipojení je plná"
-#: mount/mount.c:950
+#: mount/mount.c:952
#, c-format
msgid "mount: %s: can't read superblock"
msgstr "mount: %s: superblok nelze pøeèíst"
-#: mount/mount.c:954
+#: mount/mount.c:956
#, c-format
msgid "mount: %s: unknown device"
msgstr "umount: blokové zaøízení %s je neznámé"
-#: mount/mount.c:959
+#: mount/mount.c:961
#, c-format
msgid "mount: fs type %s not supported by kernel"
msgstr "mount: typ ss %s není podporován jádrem"
-#: mount/mount.c:971
+#: mount/mount.c:973
#, c-format
msgid "mount: probably you meant %s"
msgstr "mount: pravdìpodobnì jste myslel %s"
-#: mount/mount.c:973
+#: mount/mount.c:975
msgid "mount: maybe you meant iso9660 ?"
msgstr "mount: mo¾ná jste myslel iso9660 ?"
-#: mount/mount.c:976
+#: mount/mount.c:978
#, 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:982
+#: mount/mount.c:984
#, 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:984
+#: mount/mount.c:986
#, c-format
msgid ""
"mount: the kernel does not recognize %s as a block device\n"
@@ -7610,92 +7811,97 @@ msgid ""
msgstr ""
"mount: jádro nerozpoznalo %s jako blokové zaøízení (mo¾ná `insmod ovladaè'?)"
-#: mount/mount.c:987
+#: mount/mount.c:989
#, 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:990
+#: mount/mount.c:992
#, c-format
msgid "mount: %s is not a block device"
msgstr "mount: %s není blokovým zaøízením"
-#: mount/mount.c:993
+#: mount/mount.c:995
#, c-format
msgid "mount: %s is not a valid block device"
msgstr "mount: %s není platným blokovým zaøízením"
#. pre-linux 1.1.38, 1.1.41 and later
#. linux 1.1.38 and later
-#: mount/mount.c:996
+#: mount/mount.c:998
msgid "block device "
msgstr "blokové zaøízení"
-#: mount/mount.c:998
+#: mount/mount.c:1000
#, c-format
msgid "mount: cannot mount %s%s read-only"
msgstr "umount: %s%s nelze pøipojit v re¾imu pouze pro ètení"
-#: mount/mount.c:1002
+#: mount/mount.c:1004
#, c-format
msgid "mount: %s%s is write-protected but explicit `-w' flag given"
msgstr "mount: %s%s je chránìno proti zápisu, pøipojuji pouze pro ètení"
-#: mount/mount.c:1018
+#: mount/mount.c:1020
#, 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:1104
+#: mount/mount.c:1107
#, c-format
msgid "mount: the label %s occurs on both %s and %s\n"
msgstr ""
-#: mount/mount.c:1108
+#: mount/mount.c:1111
#, fuzzy, c-format
msgid "mount: %s duplicate - not mounted"
msgstr "umount: %s není pøipojeno"
-#: mount/mount.c:1118
+#: mount/mount.c:1121
#, c-format
msgid "mount: going to mount %s by %s\n"
msgstr "mount: chystám se pøipojit %s dle %s\n"
-#: mount/mount.c:1119
+#: mount/mount.c:1122
msgid "UUID"
msgstr "UUID"
-#: mount/mount.c:1119
+#: mount/mount.c:1122
msgid "label"
msgstr "popis"
-#: mount/mount.c:1121 mount/mount.c:1521
+#: mount/mount.c:1124 mount/mount.c:1555
msgid "mount: no such partition found"
msgstr "mount: ¾ádný odpovídající diskový oddíl nebyl nalezen"
-#: mount/mount.c:1129
+#: mount/mount.c:1132
msgid "mount: no type was given - I'll assume nfs because of the colon\n"
msgstr "mount: nebyl zadán typ - budu pou¾ívat nfs kvùli dvojteèce\n"
+#: mount/mount.c:1137
+#, fuzzy
+msgid "mount: no type was given - I'll assume smb because of the // prefix\n"
+msgstr "mount: nebyl zadán typ - budu pou¾ívat nfs kvùli dvojteèce\n"
+
#.
#. * Retry in the background.
#.
-#: mount/mount.c:1145
+#: mount/mount.c:1153
#, c-format
msgid "mount: backgrounding \"%s\"\n"
msgstr "mount: pracuji na pozadí \"%s\"\n"
-#: mount/mount.c:1156
+#: mount/mount.c:1164
#, c-format
msgid "mount: giving up \"%s\"\n"
msgstr "mount: konèím \"%s\"\n"
-#: mount/mount.c:1216
+#: mount/mount.c:1240
#, c-format
msgid "mount: %s already mounted on %s\n"
msgstr "mount: %s je ji¾ pøipojeno na %s\n"
-#: mount/mount.c:1335
+#: mount/mount.c:1369
#, fuzzy
msgid ""
"Usage: mount -V : print version\n"
@@ -7744,75 +7950,75 @@ msgstr ""
"Dal¹í pøepínaèe: [-nfFrsvw] [-o volby].\n"
"Dal¹í informace viz man(8).\n"
-#: mount/mount.c:1497
+#: mount/mount.c:1531
msgid "mount: only root can do that"
msgstr "mount: toto mù¾e provést pouze superu¾ivatel"
-#: mount/mount.c:1502
+#: mount/mount.c:1536
#, c-format
msgid "mount: no %s found - creating it..\n"
msgstr "mount: %s nebylo nalezeno - vytváøím jej..\n"
-#: mount/mount.c:1516
+#: mount/mount.c:1550
#, c-format
msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
msgstr ""
-#: mount/mount.c:1523
+#: mount/mount.c:1557
#, c-format
msgid "mount: mounting %s\n"
msgstr "mount: pøipojuji %s\n"
-#: mount/mount.c:1532
+#: mount/mount.c:1566
msgid "nothing was mounted"
msgstr "nebyl pøipojen ¾ádný diskový oddíl"
-#: mount/mount.c:1547
+#: mount/mount.c:1581
#, c-format
msgid "mount: cannot find %s in %s"
msgstr "mount: %s nelze v %s nalézt"
-#: mount/mount.c:1562
+#: mount/mount.c:1596
#, c-format
msgid "mount: can't find %s in %s or %s"
msgstr "mount: %s nelze nalézt v %s ani %s"
-#: mount/mount_by_label.c:169
+#: mount/mount_by_label.c:199
#, c-format
msgid ""
"mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
msgstr ""
"mount: %s nelze otevøít,tak¾e konverze UUID a LABEL nebude provedena.\n"
-#: mount/mount_by_label.c:295
+#: mount/mount_by_label.c:325
msgid "mount: bad UUID"
msgstr "mount: chybné UUID"
-#: mount/mount_guess_fstype.c:487
+#: mount/mount_guess_fstype.c:482
#, fuzzy
msgid "mount: error while guessing filesystem type\n"
msgstr "mount: musíte zadat typ systému souborù"
-#: mount/mount_guess_fstype.c:496
+#: mount/mount_guess_fstype.c:491
#, 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:499
+#: mount/mount_guess_fstype.c:494
#, 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"
-#: mount/mount_guess_fstype.c:502
+#: mount/mount_guess_fstype.c:497
msgid " and it looks like this is swapspace\n"
msgstr " a vypadá to, ¾e se jedná o odkládací prostor\n"
-#: mount/mount_guess_fstype.c:504
+#: mount/mount_guess_fstype.c:499
#, c-format
msgid " I will try type %s\n"
msgstr " Vyzkou¹ím typ %s\n"
-#: mount/mount_guess_fstype.c:592
+#: mount/mount_guess_fstype.c:587
#, c-format
msgid "Trying %s\n"
msgstr "Pou¾ívám %s.\n"
@@ -7906,7 +8112,7 @@ msgstr "návratová hodnota nfs status %d je neznámá"
msgid "bug in xstrndup call"
msgstr "chyba ve volání xstrndup"
-#: mount/swapon.c:51
+#: mount/swapon.c:56
#, c-format
msgid ""
"usage: %s [-hV]\n"
@@ -7919,29 +8125,45 @@ msgstr ""
" %s [-v] [-p priorita] zvlá¹tní soubor ...\n"
" %s [-s]\n"
-#: mount/swapon.c:88
+#: mount/swapon.c:66
+#, fuzzy, c-format
+msgid ""
+"usage: %s [-hV]\n"
+" %s -a [-v]\n"
+" %s [-v] special ...\n"
+msgstr ""
+"Pou¾ití: %s [-hV]\n"
+" %s -a [-v]\n"
+" %s [-v] [-p priorita] zvlá¹tní soubor ...\n"
+" %s [-s]\n"
+
+#: mount/swapon.c:170 mount/swapon.c:234
#, c-format
msgid "%s on %s\n"
msgstr "%s na %s\n"
-#: mount/swapon.c:93
+#: mount/swapon.c:174
#, c-format
msgid "swapon: cannot stat %s: %s\n"
msgstr "swapon: volání stat pro %s selhalo: %s\n"
-#: mount/swapon.c:105
+#: mount/swapon.c:185
#, c-format
msgid "swapon: warning: %s has insecure permissions %04o, %04o suggested\n"
msgstr ""
"swapon: varování: pøístupová práva pro %s (%04o) nejsou bezpeèná, pou¾ijte %"
"04o\n"
-#: mount/swapon.c:115
+#: mount/swapon.c:197
#, c-format
msgid "swapon: Skipping file %s - it appears to have holes.\n"
msgstr "swapon: soubor %s vynechávám - zdá se, ¾e v nìm jsou díry.\n"
-#: mount/swapon.c:222
+#: mount/swapon.c:240
+msgid "Not superuser.\n"
+msgstr ""
+
+#: mount/swapon.c:298 mount/swapon.c:386
#, c-format
msgid "%s: cannot open %s: %s\n"
msgstr "%s: %s nelze otevøít: %s\n"
@@ -8313,28 +8535,28 @@ msgstr "%s na %s\n"
msgid "%s: unknown argument: %s\n"
msgstr "%s: neznámý signál %s\n"
-#: sys-utils/ipcs.c:122
+#: sys-utils/ipcs.c:121
#, c-format
msgid "usage : %s -asmq -tclup \n"
msgstr "Pou¾ití : %s -asmq -tclup \n"
-#: sys-utils/ipcs.c:123
+#: sys-utils/ipcs.c:122
#, c-format
msgid "\t%s [-s -m -q] -i id\n"
msgstr "\t%s [-s -m -q] -i id\n"
-#: sys-utils/ipcs.c:124
+#: sys-utils/ipcs.c:123
#, c-format
msgid "\t%s -h for help.\n"
msgstr "\t%s -h pro nápovìdu.\n"
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:129
#, fuzzy, c-format
msgid ""
"%s provides information on ipc facilities for which you have read access.\n"
msgstr "%s poskytuje informace o ipc prostøedcích, "
-#: sys-utils/ipcs.c:132
+#: sys-utils/ipcs.c:131
msgid ""
"Resource Specification:\n"
"\t-m : shared_mem\n"
@@ -8344,7 +8566,7 @@ msgstr ""
"\t-m : sdílená pamì»\n"
"\t-q : zprávy\n"
-#: sys-utils/ipcs.c:133
+#: sys-utils/ipcs.c:132
msgid ""
"\t-s : semaphores\n"
"\t-a : all (default)\n"
@@ -8352,7 +8574,7 @@ msgstr ""
"\t-s : semafory\n"
"\t-a : v¹e (implicitní)\n"
-#: sys-utils/ipcs.c:134
+#: sys-utils/ipcs.c:133
msgid ""
"Output Format:\n"
"\t-t : time\n"
@@ -8364,7 +8586,7 @@ msgstr ""
"\t-p : pid\n"
"\t-c : tvùrce\n"
-#: sys-utils/ipcs.c:135
+#: sys-utils/ipcs.c:134
msgid ""
"\t-l : limits\n"
"\t-u : summary\n"
@@ -8372,376 +8594,376 @@ msgstr ""
"\t-l : omezení\n"
"\t-u : shrnutí\n"
-#: sys-utils/ipcs.c:136
+#: sys-utils/ipcs.c:135
msgid "-i id [-s -q -m] : details on resource identified by id\n"
msgstr "-i id [-s -q -m] : podrobnosti o prostøedku urèeném dle id\n"
-#: sys-utils/ipcs.c:268
+#: sys-utils/ipcs.c:267
msgid "kernel not configured for shared memory\n"
msgstr "jádro nepodporuje sdílenou pamì»\n"
-#: sys-utils/ipcs.c:274
+#: sys-utils/ipcs.c:273
msgid "------ Shared Memory Limits --------\n"
msgstr "------ Omezení pro sdílenou pamì» --------\n"
#. glibc 2.1.3 and all earlier libc's have ints as fields
#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
-#: sys-utils/ipcs.c:279
+#: sys-utils/ipcs.c:278
#, c-format
msgid "max number of segments = %ld\n"
msgstr "maximální poèet segmentù = %ld\n"
-#: sys-utils/ipcs.c:281
+#: sys-utils/ipcs.c:280
#, c-format
msgid "max seg size (kbytes) = %ld\n"
msgstr "maximální velikost segmentu (v kilobajtech) = %ld\n"
-#: sys-utils/ipcs.c:283
+#: sys-utils/ipcs.c:282
#, c-format
msgid "max total shared memory (kbytes) = %ld\n"
msgstr "celkové maximum pro sdílenou pamì» (v kilobajtech) = %ld\n"
-#: sys-utils/ipcs.c:285
+#: sys-utils/ipcs.c:284
#, c-format
msgid "min seg size (bytes) = %ld\n"
msgstr "minimální velikost segmentu (v bajtech) = %ld\n"
-#: sys-utils/ipcs.c:290
+#: sys-utils/ipcs.c:289
msgid "------ Shared Memory Status --------\n"
msgstr "------ Stav sdílené pamìti --------\n"
-#: sys-utils/ipcs.c:291
+#: sys-utils/ipcs.c:290
#, c-format
msgid "segments allocated %d\n"
msgstr "alokované segmenty %d\n"
-#: sys-utils/ipcs.c:292
+#: sys-utils/ipcs.c:291
#, c-format
msgid "pages allocated %ld\n"
msgstr "alokované stránky %ld\n"
-#: sys-utils/ipcs.c:293
+#: sys-utils/ipcs.c:292
#, c-format
msgid "pages resident %ld\n"
msgstr "rezidentní stránky %ld\n"
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:293
#, c-format
msgid "pages swapped %ld\n"
msgstr "stránky v odkládacím prostoru %ld\n"
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:294
#, c-format
msgid "Swap performance: %ld attempts\t %ld successes\n"
msgstr "Statistika pro odkládání: pokusù: %ld\t, z toho úspì¹ných: %ld\n"
-#: sys-utils/ipcs.c:300
+#: sys-utils/ipcs.c:299
msgid "------ Shared Memory Segment Creators/Owners --------\n"
msgstr "------ Tvùrci/vlastníci segmentù sdílené pamìti ------\n"
-#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:300 sys-utils/ipcs.c:417 sys-utils/ipcs.c:516
#, c-format
msgid "%-10s %-10s %-10s %-10s %-10s %-10s\n"
msgstr "%-10s %-10s %-10s %-10s %-10s %-10s\n"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:308 sys-utils/ipcs.c:315
-#: sys-utils/ipcs.c:321 sys-utils/ipcs.c:425
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:307 sys-utils/ipcs.c:314
+#: sys-utils/ipcs.c:320 sys-utils/ipcs.c:424
msgid "shmid"
msgstr "shmid"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:321 sys-utils/ipcs.c:419
-#: sys-utils/ipcs.c:434 sys-utils/ipcs.c:519 sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:320 sys-utils/ipcs.c:418
+#: sys-utils/ipcs.c:433 sys-utils/ipcs.c:517 sys-utils/ipcs.c:535
msgid "perms"
msgstr "práva"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:517
msgid "cuid"
msgstr "cuid"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:517
msgid "cgid"
msgstr "cgid"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:517
msgid "uid"
msgstr "uid"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:517
msgid "gid"
msgstr "gid"
-#: sys-utils/ipcs.c:306
+#: sys-utils/ipcs.c:305
msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
msgstr "------ Èasy pøipojení/odpojení/zmìny pro sdílenou pamì» --------\n"
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:306
#, c-format
msgid "%-10s %-10s %-20s %-20s %-20s\n"
msgstr "%-10s %-10s %-20s %-20s %-20s\n"
-#: sys-utils/ipcs.c:308 sys-utils/ipcs.c:315 sys-utils/ipcs.c:321
-#: sys-utils/ipcs.c:425 sys-utils/ipcs.c:434 sys-utils/ipcs.c:525
-#: sys-utils/ipcs.c:531 sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:314 sys-utils/ipcs.c:320
+#: sys-utils/ipcs.c:424 sys-utils/ipcs.c:433 sys-utils/ipcs.c:523
+#: sys-utils/ipcs.c:529 sys-utils/ipcs.c:535
msgid "owner"
msgstr "vlastník"
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:307
msgid "attached"
msgstr "pøipojení"
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:307
msgid "detached"
msgstr "odpojení"
-#: sys-utils/ipcs.c:309
+#: sys-utils/ipcs.c:308
msgid "changed"
msgstr "zmìna"
-#: sys-utils/ipcs.c:313
+#: sys-utils/ipcs.c:312
msgid "------ Shared Memory Creator/Last-op --------\n"
msgstr "------ Tvùrce sdílené pamìti/poslední operace --------\n"
-#: sys-utils/ipcs.c:314 sys-utils/ipcs.c:530
+#: sys-utils/ipcs.c:313 sys-utils/ipcs.c:528
#, c-format
msgid "%-10s %-10s %-10s %-10s\n"
msgstr "%-10s %-10s %-10s %-10s\n"
-#: sys-utils/ipcs.c:315
+#: sys-utils/ipcs.c:314
msgid "cpid"
msgstr "cpid"
-#: sys-utils/ipcs.c:315
+#: sys-utils/ipcs.c:314
msgid "lpid"
msgstr "lpid"
-#: sys-utils/ipcs.c:319
+#: sys-utils/ipcs.c:318
msgid "------ Shared Memory Segments --------\n"
msgstr "------ Segmenty sdílené pamìti --------\n"
-#: sys-utils/ipcs.c:320
+#: sys-utils/ipcs.c:319
#, c-format
msgid "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n"
msgstr "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n"
-#: sys-utils/ipcs.c:321 sys-utils/ipcs.c:434 sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:320 sys-utils/ipcs.c:433 sys-utils/ipcs.c:535
msgid "key"
msgstr "klíè"
-#: sys-utils/ipcs.c:321
+#: sys-utils/ipcs.c:320
msgid "bytes"
msgstr "bajty"
-#: sys-utils/ipcs.c:322
+#: sys-utils/ipcs.c:321
msgid "nattch"
msgstr "nattch"
-#: sys-utils/ipcs.c:322 sys-utils/ipcs.c:435
+#: sys-utils/ipcs.c:321
msgid "status"
msgstr "stav"
-#: sys-utils/ipcs.c:343 sys-utils/ipcs.c:345 sys-utils/ipcs.c:347
-#: sys-utils/ipcs.c:456 sys-utils/ipcs.c:458 sys-utils/ipcs.c:558
-#: sys-utils/ipcs.c:560 sys-utils/ipcs.c:562 sys-utils/ipcs.c:615
-#: sys-utils/ipcs.c:617 sys-utils/ipcs.c:646 sys-utils/ipcs.c:648
-#: sys-utils/ipcs.c:650 sys-utils/ipcs.c:674
+#: sys-utils/ipcs.c:342 sys-utils/ipcs.c:344 sys-utils/ipcs.c:346
+#: sys-utils/ipcs.c:455 sys-utils/ipcs.c:457 sys-utils/ipcs.c:556
+#: sys-utils/ipcs.c:558 sys-utils/ipcs.c:560 sys-utils/ipcs.c:613
+#: sys-utils/ipcs.c:615 sys-utils/ipcs.c:644 sys-utils/ipcs.c:646
+#: sys-utils/ipcs.c:648 sys-utils/ipcs.c:672
msgid "Not set"
msgstr "Nenastaveno"
-#: sys-utils/ipcs.c:372
+#: sys-utils/ipcs.c:371
msgid "dest"
msgstr "cíl"
-#: sys-utils/ipcs.c:373
+#: sys-utils/ipcs.c:372
msgid "locked"
msgstr "zamèeno"
-#: sys-utils/ipcs.c:393
+#: sys-utils/ipcs.c:392
msgid "kernel not configured for semaphores\n"
msgstr "jádro nepodporuje semafory\n"
-#: sys-utils/ipcs.c:399
+#: sys-utils/ipcs.c:398
msgid "------ Semaphore Limits --------\n"
msgstr "------Omezení pro semafory --------\n"
-#: sys-utils/ipcs.c:403
+#: sys-utils/ipcs.c:402
#, c-format
msgid "max number of arrays = %d\n"
msgstr "maximální poèet polí = %d\n"
-#: sys-utils/ipcs.c:404
+#: sys-utils/ipcs.c:403
#, c-format
msgid "max semaphores per array = %d\n"
msgstr "maximální poèet semaforù v poli = %d\n"
-#: sys-utils/ipcs.c:405
+#: sys-utils/ipcs.c:404
#, c-format
msgid "max semaphores system wide = %d\n"
msgstr "celkový maximální poèet semaforù = %d\n"
-#: sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:405
#, c-format
msgid "max ops per semop call = %d\n"
msgstr "maximální poèet operací na jedno semop volání = %d\n"
-#: sys-utils/ipcs.c:407
+#: sys-utils/ipcs.c:406
#, c-format
msgid "semaphore max value = %d\n"
msgstr "maximální hodnota semaforu = %d\n"
-#: sys-utils/ipcs.c:411
+#: sys-utils/ipcs.c:410
msgid "------ Semaphore Status --------\n"
msgstr "------ Stav semaforu --------\n"
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:411
#, c-format
msgid "used arrays = %d\n"
msgstr "pou¾itá pole = %d\n"
-#: sys-utils/ipcs.c:413
+#: sys-utils/ipcs.c:412
#, c-format
msgid "allocated semaphores = %d\n"
msgstr "alokované semafory = %d\n"
-#: sys-utils/ipcs.c:417
+#: sys-utils/ipcs.c:416
msgid "------ Semaphore Arrays Creators/Owners --------\n"
msgstr "------ Tvùrci/vlastníci polí semaforù --------\n"
-#: sys-utils/ipcs.c:419 sys-utils/ipcs.c:434
+#: sys-utils/ipcs.c:418 sys-utils/ipcs.c:433
msgid "semid"
msgstr "semid"
-#: sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:422
msgid "------ Shared Memory Operation/Change Times --------\n"
msgstr "------ Èasy operace/zmìny sdílené pamìti --------\n"
-#: sys-utils/ipcs.c:424
+#: sys-utils/ipcs.c:423
#, c-format
msgid "%-8s %-10s %-26.24s %-26.24s\n"
msgstr "%-8s %-10s %-26.24s %-26.24s\n"
-#: sys-utils/ipcs.c:425
+#: sys-utils/ipcs.c:424
msgid "last-op"
msgstr "poslední operace"
-#: sys-utils/ipcs.c:425
+#: sys-utils/ipcs.c:424
msgid "last-changed"
msgstr "poslední zmìna"
-#: sys-utils/ipcs.c:432
+#: sys-utils/ipcs.c:431
msgid "------ Semaphore Arrays --------\n"
msgstr "------ Pole semaforù --------\n"
-#: sys-utils/ipcs.c:433
+#: sys-utils/ipcs.c:432 sys-utils/ipcs.c:675
#, c-format
-msgid "%-10s %-10s %-10s %-10s %-10s %-12s\n"
-msgstr "%-10s %-10s %-10s %-10s %-10s %-12s\n"
+msgid "%-10s %-10s %-10s %-10s %-10s\n"
+msgstr "%-10s %-10s %-10s %-10s %-10s\n"
-#: sys-utils/ipcs.c:435
+#: sys-utils/ipcs.c:434
msgid "nsems"
msgstr "nsems"
-#: sys-utils/ipcs.c:495
+#: sys-utils/ipcs.c:493
msgid "kernel not configured for message queues\n"
msgstr "jádro nepodporuje fronty zpráv\n"
-#: sys-utils/ipcs.c:503
+#: sys-utils/ipcs.c:501
msgid "------ Messages: Limits --------\n"
msgstr "------ Zprávy: Omezení --------\n"
-#: sys-utils/ipcs.c:504
+#: sys-utils/ipcs.c:502
#, c-format
msgid "max queues system wide = %d\n"
msgstr "celkový maximální poèet front = %d\n"
-#: sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:503
#, c-format
msgid "max size of message (bytes) = %d\n"
msgstr "maximální velikost zprávy (v bajtech) = %d\n"
-#: sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:504
#, c-format
msgid "default max size of queue (bytes) = %d\n"
msgstr "implicitní maximální velikost fronty (v bajtech) = %d\n"
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:508
msgid "------ Messages: Status --------\n"
msgstr "------ Zprávy: Stav --------\n"
-#: sys-utils/ipcs.c:511
+#: sys-utils/ipcs.c:509
#, c-format
msgid "allocated queues = %d\n"
msgstr "alokované fronty = %d\n"
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:510
#, c-format
msgid "used headers = %d\n"
msgstr "pou¾ité hlavièky = %d\n"
-#: sys-utils/ipcs.c:513
+#: sys-utils/ipcs.c:511
#, c-format
msgid "used space = %d bytes\n"
msgstr "pou¾itý prostor (v bajtech) = %d\n"
-#: sys-utils/ipcs.c:517
+#: sys-utils/ipcs.c:515
msgid "------ Message Queues: Creators/Owners --------\n"
msgstr "------ Fronty zpráv: Tvùrci/Vlastníci --------\n"
-#: sys-utils/ipcs.c:519 sys-utils/ipcs.c:525 sys-utils/ipcs.c:531
-#: sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:517 sys-utils/ipcs.c:523 sys-utils/ipcs.c:529
+#: sys-utils/ipcs.c:535
msgid "msqid"
msgstr "msqid"
-#: sys-utils/ipcs.c:523
+#: sys-utils/ipcs.c:521
msgid "------ Message Queues Send/Recv/Change Times --------\n"
msgstr "------ Èasy odeslání.pøíchodu/zmìny pro fronty zpráv --------\n"
-#: sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:522
#, c-format
msgid "%-8s %-10s %-20s %-20s %-20s\n"
msgstr "%-8s %-10s %-20s %-20s %-20s\n"
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:523
msgid "send"
msgstr "odeslání"
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:523
msgid "recv"
msgstr "pøíjem"
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:523
msgid "change"
msgstr "zmìna"
-#: sys-utils/ipcs.c:529
+#: sys-utils/ipcs.c:527
msgid "------ Message Queues PIDs --------\n"
msgstr "------ PID pro fronty zpráv --------\n"
-#: sys-utils/ipcs.c:531
+#: sys-utils/ipcs.c:529
msgid "lspid"
msgstr "lspid"
-#: sys-utils/ipcs.c:531
+#: sys-utils/ipcs.c:529
msgid "lrpid"
msgstr "lrpid"
-#: sys-utils/ipcs.c:535
+#: sys-utils/ipcs.c:533
msgid "------ Message Queues --------\n"
msgstr "------ Fronty zpráv --------\n"
-#: sys-utils/ipcs.c:536
+#: sys-utils/ipcs.c:534
#, c-format
msgid "%-10s %-10s %-10s %-10s %-12s %-12s\n"
msgstr "%-10s %-10s %-10s %-10s %-12s %-12s\n"
-#: sys-utils/ipcs.c:538
+#: sys-utils/ipcs.c:536
msgid "used-bytes"
msgstr "u¾ité bajty"
-#: sys-utils/ipcs.c:538
+#: sys-utils/ipcs.c:536
msgid "messages"
msgstr "zprávy"
-#: sys-utils/ipcs.c:606
+#: sys-utils/ipcs.c:604
#, c-format
msgid ""
"\n"
@@ -8750,37 +8972,37 @@ msgstr ""
"\n"
"shmid segmentu sdílené pamìti = %d\n"
-#: sys-utils/ipcs.c:607
+#: sys-utils/ipcs.c:605
#, c-format
msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
-#: sys-utils/ipcs.c:609
+#: sys-utils/ipcs.c:607
#, c-format
msgid "mode=%#o\taccess_perms=%#o\n"
msgstr "mód=%#o\tpøístupová práva=%#o\n"
-#: sys-utils/ipcs.c:611
+#: sys-utils/ipcs.c:609
#, c-format
msgid "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n"
msgstr "bajtù=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n"
-#: sys-utils/ipcs.c:614
+#: sys-utils/ipcs.c:612
#, c-format
msgid "att_time=%-26.24s\n"
msgstr "pøipoj_èas=%-26.24s\n"
-#: sys-utils/ipcs.c:616
+#: sys-utils/ipcs.c:614
#, c-format
msgid "det_time=%-26.24s\n"
msgstr "odpoj_èas=%-26.24s\n"
-#: sys-utils/ipcs.c:618 sys-utils/ipcs.c:649
+#: sys-utils/ipcs.c:616 sys-utils/ipcs.c:647
#, c-format
msgid "change_time=%-26.24s\n"
msgstr "èas_zmìny=%-26.24s\n"
-#: sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:631
#, c-format
msgid ""
"\n"
@@ -8789,27 +9011,27 @@ msgstr ""
"\n"
"msgid fronty zpráv=%d\n"
-#: sys-utils/ipcs.c:634
+#: sys-utils/ipcs.c:632
#, c-format
msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmód=%#o\n"
-#: sys-utils/ipcs.c:636
+#: sys-utils/ipcs.c:634
#, c-format
msgid "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
msgstr "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
-#: sys-utils/ipcs.c:645
+#: sys-utils/ipcs.c:643
#, c-format
msgid "send_time=%-26.24s\n"
msgstr "èas odeslání=%-26.24s\n"
-#: sys-utils/ipcs.c:647
+#: sys-utils/ipcs.c:645
#, c-format
msgid "rcv_time=%-26.24s\n"
msgstr "èas pøíjmu=%-26.24s\n"
-#: sys-utils/ipcs.c:667
+#: sys-utils/ipcs.c:665
#, c-format
msgid ""
"\n"
@@ -8818,53 +9040,48 @@ msgstr ""
"\n"
"semid pole semaforù = %d\n"
-#: sys-utils/ipcs.c:668
+#: sys-utils/ipcs.c:666
#, c-format
msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
msgstr "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
-#: sys-utils/ipcs.c:670
+#: sys-utils/ipcs.c:668
#, c-format
msgid "mode=%#o, access_perms=%#o\n"
msgstr "mód=%#o, pøístupová práva=%#o\n"
-#: sys-utils/ipcs.c:672
+#: sys-utils/ipcs.c:670
#, c-format
msgid "nsems = %ld\n"
msgstr "nsems = %ld\n"
-#: sys-utils/ipcs.c:673
+#: sys-utils/ipcs.c:671
#, c-format
msgid "otime = %-26.24s\n"
msgstr "èas poslední operace = %-26.24s\n"
-#: sys-utils/ipcs.c:675
+#: sys-utils/ipcs.c:673
#, c-format
msgid "ctime = %-26.24s\n"
msgstr "èas zmìny = %-26.24s\n"
-#: sys-utils/ipcs.c:677
-#, c-format
-msgid "%-10s %-10s %-10s %-10s %-10s\n"
-msgstr "%-10s %-10s %-10s %-10s %-10s\n"
-
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "semnum"
msgstr "semnum"
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "value"
msgstr "hodnota"
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "ncount"
msgstr "ncount"
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "zcount"
msgstr "zcount"
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "pid"
msgstr "pid"
@@ -9111,11 +9328,11 @@ msgstr "-- øádek ji¾ není v bufru"
msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
msgstr "Pou¾ití: %s [ - ] [-2 ] [ soubor ... ]\n"
-#: text-utils/column.c:298
+#: text-utils/column.c:297
msgid "line too long"
msgstr "øádek je pøíli¹ dlouhý"
-#: text-utils/column.c:375
+#: text-utils/column.c:374
msgid "usage: column [-tx] [-c columns] [file ...]\n"
msgstr "Pou¾ití: column [-tx] [c sloupce] [soubor ...]\n"
@@ -9208,33 +9425,33 @@ msgstr ""
msgid "Can't open help file"
msgstr "Soubor s nápovìdou nelze otevøít."
-#: text-utils/more.c:1442 text-utils/more.c:1446
+#: text-utils/more.c:1442 text-utils/more.c:1447
msgid "[Press 'h' for instructions.]"
msgstr "[Stisknìte 'h' pro nápovìdu.]"
-#: text-utils/more.c:1480
+#: text-utils/more.c:1481
#, c-format
msgid "\"%s\" line %d"
msgstr "\"%s\" øádek %d"
-#: text-utils/more.c:1482
+#: text-utils/more.c:1483
#, c-format
msgid "[Not a file] line %d"
msgstr "[Nejedná se o soubor] øádek %d"
-#: text-utils/more.c:1566
+#: text-utils/more.c:1567
msgid " Overflow\n"
msgstr " Pøeteèení\n"
-#: text-utils/more.c:1613
+#: text-utils/more.c:1614
msgid "...skipping\n"
msgstr "...vynechávám\n"
-#: text-utils/more.c:1643
+#: text-utils/more.c:1644
msgid "Regular expression botch"
msgstr "Chyba v regulárním výrazu"
-#: text-utils/more.c:1655
+#: text-utils/more.c:1656
msgid ""
"\n"
"Pattern not found\n"
@@ -9242,15 +9459,15 @@ msgstr ""
"\n"
"Vzorek nebyl nalezen\n"
-#: text-utils/more.c:1658
+#: text-utils/more.c:1659 text-utils/pg.c:1134 text-utils/pg.c:1285
msgid "Pattern not found"
msgstr "Vzorek nebyl nalezen"
-#: text-utils/more.c:1719
+#: text-utils/more.c:1720
msgid "can't fork\n"
msgstr "volání fork selhalo\n"
-#: text-utils/more.c:1758
+#: text-utils/more.c:1759
msgid ""
"\n"
"...Skipping "
@@ -9258,21 +9475,21 @@ msgstr ""
"\n"
"...Vynechávám "
-#: text-utils/more.c:1763
+#: text-utils/more.c:1764
#, fuzzy
msgid "...Skipping to file "
msgstr "...Pøecházím "
-#: text-utils/more.c:1765
+#: text-utils/more.c:1766
#, fuzzy
msgid "...Skipping back to file "
msgstr "zpìt na soubor "
-#: text-utils/more.c:2046
+#: text-utils/more.c:2047
msgid "Line too long"
msgstr "Øádek je pøíli¹ dlouhý"
-#: text-utils/more.c:2089
+#: text-utils/more.c:2090
msgid "No previous command to substitute for"
msgstr "Neexistuje ¾ádný pøíkaz, jen¾ by bylo mo¾no nahradit"
@@ -9322,6 +9539,102 @@ msgstr "hexdump: chybný formát {%s}\n"
msgid "hexdump: bad conversion character %%%s.\n"
msgstr "hexdump: chybný znak v konverzi %%%s.\n"
+#: text-utils/pg.c:246
+#, c-format
+msgid ""
+"%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
+msgstr ""
+
+#: text-utils/pg.c:255
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- %s\n"
+msgstr "pøepínaè `%s' vy¾aduje argument\n"
+
+#: text-utils/pg.c:263
+#, fuzzy, c-format
+msgid "%s: illegal option -- %s\n"
+msgstr "Chybná klávesa"
+
+#: text-utils/pg.c:380
+#, fuzzy
+msgid "...skipping forward\n"
+msgstr "...vynechávám\n"
+
+#: text-utils/pg.c:382
+#, fuzzy
+msgid "...skipping backward\n"
+msgstr "...vynechávám\n"
+
+#: text-utils/pg.c:404
+#, fuzzy
+msgid "No next file"
+msgstr "(Dal¹í soubor: %s)"
+
+#: text-utils/pg.c:408
+#, fuzzy
+msgid "No previous file"
+msgstr "Nejsou definovány ¾ádné diskové oddíly\n"
+
+#: text-utils/pg.c:938
+#, fuzzy, c-format
+msgid "%s: Read error from %s file\n"
+msgstr "%s: chyba zápisu na %s\n"
+
+#.
+#. * Most likely '\0' in input.
+#.
+#: text-utils/pg.c:944
+#, c-format
+msgid "%s: Unexpected EOF in %s file\n"
+msgstr ""
+
+#: text-utils/pg.c:947
+#, fuzzy, c-format
+msgid "%s: Unknown error in %s file\n"
+msgstr "%s: chyba zápisu na %s\n"
+
+#: text-utils/pg.c:1042
+#, fuzzy, c-format
+msgid "%s: Cannot create tempfile\n"
+msgstr "%s: doèasný soubor nelze èíst.\n"
+
+#: text-utils/pg.c:1051 text-utils/pg.c:1226
+#, fuzzy
+msgid "RE error: "
+msgstr ", chyba"
+
+#: text-utils/pg.c:1208
+msgid "(EOF)"
+msgstr ""
+
+#: text-utils/pg.c:1234
+msgid "No remembered search string"
+msgstr ""
+
+#: text-utils/pg.c:1317
+#, fuzzy
+msgid "Cannot open "
+msgstr "%s nelze otevøít.\n"
+
+#: text-utils/pg.c:1365
+#, fuzzy
+msgid "saved"
+msgstr "odeslání"
+
+#: text-utils/pg.c:1472
+msgid ": !command not allowed in rflag mode.\n"
+msgstr ""
+
+#: text-utils/pg.c:1504
+#, fuzzy
+msgid "fork() failed, try again later\n"
+msgstr "Heslo *NEBYLO* zmìnìno. Zkuste to pozdìji.\n"
+
+#: text-utils/pg.c:1709
+#, fuzzy
+msgid "(Next file: "
+msgstr "(Dal¹í soubor: %s)"
+
#: text-utils/rev.c:113
msgid "Unable to allocate bufferspace\n"
msgstr "Místo pro buffer nelze naalokovat.\n"
@@ -9356,6 +9669,27 @@ msgstr "Vstupní øádka je pøíli¹ dlouhá.\n"
msgid "Out of memory when growing buffer.\n"
msgstr "Nedostatek pamìti pro rostoucí buffer.\n"
+#~ msgid "invalid number `%s'\n"
+#~ msgstr "Chybné èíslo `%s'\n"
+
+#~ msgid "number `%s' to `%s' out of range\n"
+#~ msgstr "Èíslo `%s' na `%s'. Hodnota je mimo meze.\n"
+
+#~ msgid "unrecognized option `%s'\n"
+#~ msgstr "neznámý pøepínaè `%s'\n"
+
+#~ msgid "option `%s' requires an argument\n"
+#~ msgstr "pøepínaè `%s' vy¾aduje argument\n"
+
+#~ msgid "option `%s' doesn't allow an argument\n"
+#~ msgstr "pøepínaè `%s' musí být zadán bez argumentu\n"
+
+#~ msgid "unrecognized option `-%c'\n"
+#~ msgstr "neznámý pøepínaè `-%c'\n"
+
+#~ msgid "%-10s %-10s %-10s %-10s %-10s %-12s\n"
+#~ msgstr "%-10s %-10s %-10s %-10s %-10s %-12s\n"
+
#~ msgid "umount: only %s can unmount %s from %s"
#~ msgstr "unmount: pouze u¾ivatel %s mù¾e odpojit %s ze %s"
diff --git a/po/da.po b/po/da.po
index d73e70789..e6e59f507 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: util-linux 2.11o\n"
-"POT-Creation-Date: 2002-05-09 02:51+0200\n"
+"POT-Creation-Date: 2002-07-07 17:03+0200\n"
"PO-Revision-Date: 2002-03-17 17:40GMT\n"
"Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
"Language-Team: Danish <dansk@klid.dk>\n"
@@ -111,28 +111,28 @@ msgstr "RO RA SST BST StartSekt Størr. Enhed\n"
msgid "usage:\n"
msgstr "brug:\n"
-#: disk-utils/fdformat.c:35
+#: disk-utils/fdformat.c:31
msgid "Formatting ... "
msgstr "Formatterer ... "
-#: disk-utils/fdformat.c:53 disk-utils/fdformat.c:88
+#: disk-utils/fdformat.c:49 disk-utils/fdformat.c:84
msgid "done\n"
msgstr "færdig\n"
-#: disk-utils/fdformat.c:64
+#: disk-utils/fdformat.c:60
msgid "Verifying ... "
msgstr "Verificerer ... "
-#: disk-utils/fdformat.c:75
+#: disk-utils/fdformat.c:71
msgid "Read: "
msgstr "Læs: "
-#: disk-utils/fdformat.c:77
+#: disk-utils/fdformat.c:73
#, c-format
msgid "Problem reading cylinder %d, expected %d, read %d\n"
msgstr "Problem ved læsning af cylinder %d, ventede %d, læste %d\n"
-#: disk-utils/fdformat.c:83
+#: disk-utils/fdformat.c:79
#, c-format
msgid ""
"bad data in cyl %d\n"
@@ -141,42 +141,148 @@ msgstr ""
"ugyldige data i cyl %d\n"
"Fortsætter ... "
-#: disk-utils/fdformat.c:98
+#: disk-utils/fdformat.c:94
#, c-format
msgid "usage: %s [ -n ] device\n"
msgstr "brug: %s [ -n ] enhed\n"
-#: disk-utils/fdformat.c:120 disk-utils/fsck.minix.c:1291
+#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1291
#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:55
-#: disk-utils/mkfs.minix.c:644 disk-utils/mkswap.c:457
-#: disk-utils/setfdprm.c:128 misc-utils/cal.c:246 misc-utils/ddate.c:181
-#: misc-utils/kill.c:188 misc-utils/rename.c:79 misc-utils/script.c:132
+#: disk-utils/mkfs.cramfs.c:665 disk-utils/mkfs.minix.c:644
+#: disk-utils/mkswap.c:457 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1170
+#: misc-utils/cal.c:246 misc-utils/ddate.c:181 misc-utils/kill.c:188
+#: misc-utils/rename.c:79 misc-utils/script.c:132
#, c-format
msgid "%s from %s\n"
msgstr "%s fra %s\n"
-#: disk-utils/fdformat.c:134
-#, c-format
-msgid "%s: not a floppy device\n"
+#: disk-utils/fdformat.c:130
+#, fuzzy, c-format
+msgid "%s: not a block device\n"
msgstr "%s: ikke et diskettedrev\n"
-#: disk-utils/fdformat.c:143
+#: disk-utils/fdformat.c:140
msgid "Could not determine current format type"
msgstr "Kunne ikke bestemme det eksisterende format"
-#: disk-utils/fdformat.c:144
+#: disk-utils/fdformat.c:141
#, c-format
msgid "%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n"
msgstr "%s-sidet, %d spor, %d sekt/spor. Samlet kapacitet %d kB.\n"
-#: disk-utils/fdformat.c:145
+#: disk-utils/fdformat.c:142
msgid "Double"
msgstr "Dobbelt"
-#: disk-utils/fdformat.c:145
+#: disk-utils/fdformat.c:142
msgid "Single"
msgstr "Enkelt"
+#: disk-utils/fsck.cramfs.c:98
+#, c-format
+msgid ""
+"usage: %s [-hv] [-x dir] file\n"
+" -h print this help\n"
+" -x dir extract into dir\n"
+" -v be more verbose\n"
+" file file to test\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:191
+#, c-format
+msgid "%s: error %d while decompressing! %p(%d)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:243
+#, fuzzy, c-format
+msgid "%s: size error in symlink `%s'\n"
+msgstr "%s: søgefejl på %s\n"
+
+#: disk-utils/fsck.cramfs.c:258 disk-utils/fsck.cramfs.c:328
+#, c-format
+msgid " uncompressing block at %ld to %ld (%ld)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:287
+#, c-format
+msgid "%s: bogus mode on `%s' (%o)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:319
+#, fuzzy, c-format
+msgid " hole at %ld (%d)\n"
+msgstr "burde være (%d, %d, %d)\n"
+
+#: disk-utils/fsck.cramfs.c:337
+#, c-format
+msgid "%s: Non-block (%ld) bytes\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:343
+#, c-format
+msgid "%s: Non-size (%ld vs %ld) bytes\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:392
+#, c-format
+msgid "%s: invalid cramfs--bad path length\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:472
+#, fuzzy, c-format
+msgid "%s: compiled without -x support\n"
+msgstr "%s: ikke oversat med understøttelse for minix v2\n"
+
+#: disk-utils/fsck.cramfs.c:498
+#, c-format
+msgid "%s: warning--unable to determine filesystem size \n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:508
+#, fuzzy, c-format
+msgid "%s is not a block device or file\n"
+msgstr "%s: ikke et diskettedrev\n"
+
+#: disk-utils/fsck.cramfs.c:514 disk-utils/fsck.cramfs.c:549
+#, c-format
+msgid "%s: invalid cramfs--file length too short\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:541
+#, c-format
+msgid "%s: invalid cramfs--wrong magic\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:554
+#, c-format
+msgid "%s: warning--file length too long, padded image?\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:564
+#, fuzzy, c-format
+msgid "%s: invalid cramfs--crc error\n"
+msgstr "%s: Fortolkerfejl ved tilvalg\n"
+
+#: disk-utils/fsck.cramfs.c:570
+#, c-format
+msgid "%s: warning--old cramfs image, no CRC\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:592
+#, c-format
+msgid "%s: invalid cramfs--bad superblock\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:608
+#, c-format
+msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:616
+#, c-format
+msgid "%s: invalid cramfs--invalid file data offset\n"
+msgstr ""
+
#: disk-utils/fsck.minix.c:200
#, c-format
msgid "Usage: %s [-larvsmf] /dev/name\n"
@@ -643,7 +749,7 @@ msgstr "for mange inodes - øvre grænse er 512"
msgid "not enough space, need at least %lu blocks"
msgstr "ikke plads nok, kræver mindst %lu blokke"
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2057
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2069
#, c-format
msgid "Device: %s\n"
msgstr "Enhed: %s\n"
@@ -727,6 +833,130 @@ msgstr "%s: Hukommelse opbrugt!\n"
msgid "mkfs version %s (%s)\n"
msgstr "mkfs version %s (%s)\n"
+#: disk-utils/mkfs.cramfs.c:49
+#, c-format
+msgid ""
+"usage: %s [-h] [-v] [-e edition] [-i file] [-n name] dirname outfile\n"
+" -h print this help\n"
+" -v be verbose\n"
+" -E make all warnings errors (non-zero exit status)\n"
+" -e edition set edition number (part of fsid)\n"
+" -i file insert a file image into the filesystem (requires >= 2.4.0)\n"
+" -n name set name of cramfs filesystem\n"
+" -p pad by %d bytes for boot code\n"
+" -s sort directory entries (old option, ignored)\n"
+" -z make explicit holes (requires >= 2.3.39)\n"
+" dirname root of the filesystem to be compressed\n"
+" outfile output file\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:213
+#, c-format
+msgid ""
+"Very long (%u bytes) filename `%s' found.\n"
+" Please increase MAX_INPUT_NAMELEN in mkcramfs.c and recompile. Exiting.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:371
+msgid "filesystem too big. Exiting.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:422
+msgid ""
+"Exceeded MAXENTRIES. Raise this value in mkcramfs.c and recompile. "
+"Exiting.\n"
+msgstr ""
+
+#. (I don't think this can happen with zlib.)
+#: disk-utils/mkfs.cramfs.c:520
+#, c-format
+msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:537
+#, c-format
+msgid "%6.2f%% (%+d bytes)\t%s\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:705
+#, c-format
+msgid ""
+"warning: guestimate of required size (upper bound) is %LdMB, but maximum "
+"image size is %uMB. We might die prematurely.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:747
+#, fuzzy, c-format
+msgid "Including: %s\n"
+msgstr "ugyldigt id: %s\n"
+
+#: disk-utils/mkfs.cramfs.c:753
+#, c-format
+msgid "Directory data: %d bytes\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:761
+#, c-format
+msgid "Everything: %d kilobytes\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:766
+#, fuzzy, c-format
+msgid "Super block: %d bytes\n"
+msgstr "brugt plads = %d byte\n"
+
+#: disk-utils/mkfs.cramfs.c:773
+#, c-format
+msgid "CRC: %x\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:778
+#, c-format
+msgid "not enough space allocated for ROM image (%Ld allocated, %d used)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:790
+#, c-format
+msgid "ROM image write failed (%d %d)\n"
+msgstr ""
+
+#. (These warnings used to come at the start, but they scroll off the
+#. screen too quickly.)
+#. (can't happen when reading from ext2fs)
+#. bytes, not chars: think UTF8.
+#: disk-utils/mkfs.cramfs.c:799
+#, fuzzy
+msgid "warning: filenames truncated to 255 bytes.\n"
+msgstr "Advarsel: inode-optælling for stor.\n"
+
+#: disk-utils/mkfs.cramfs.c:802
+msgid "warning: files were skipped due to errors.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:805
+#, c-format
+msgid "warning: file sizes truncated to %luMB (minus 1 byte).\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:810
+#, c-format
+msgid ""
+"warning: uids truncated to %u bits. (This may be a security concern.)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:815
+#, c-format
+msgid ""
+"warning: gids truncated to %u bits. (This may be a security concern.)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:820
+#, c-format
+msgid ""
+"WARNING: device numbers truncated to %u bits. This almost certainly means\n"
+"that some device files will be wrong.\n"
+msgstr ""
+
#: disk-utils/mkfs.minix.c:181
#, c-format
msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
@@ -871,7 +1101,7 @@ msgid "too many bad pages"
msgstr "for mange ugyldige sider"
#: disk-utils/mkswap.c:359 misc-utils/look.c:182 misc-utils/setterm.c:1130
-#: text-utils/more.c:2062 text-utils/more.c:2073
+#: text-utils/more.c:2063 text-utils/more.c:2074
msgid "Out of memory"
msgstr "Hukommelse opbrugt"
@@ -1311,7 +1541,7 @@ msgstr " Logisk "
#. odd flag on end
#. type id
#. type name
-#: fdisk/cfdisk.c:1996 fdisk/fdisk.c:1306 fdisk/fdisk.c:1594
+#: fdisk/cfdisk.c:1996 fdisk/fdisk.c:1318 fdisk/fdisk.c:1606
#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:690 fdisk/sfdisk.c:581
msgid "Unknown"
msgstr "Ukendt"
@@ -1842,7 +2072,7 @@ msgstr ""
" hoveder og sektorer/spor.\n"
"\n"
-#: fdisk/fdisk.c:194
+#: fdisk/fdisk.c:195
msgid ""
"Usage: fdisk [-b SSZ] [-u] DISK Change partition table\n"
" fdisk -l [-b SSZ] [-u] DISK List partition table(s)\n"
@@ -1862,7 +2092,7 @@ msgstr ""
"-u: angiv start og slut som sektornumre (i stedet for cylindernumre)\n"
"-b 2048: (for visse MO-drev) brug sektorer på 2048 byte\n"
-#: fdisk/fdisk.c:206
+#: fdisk/fdisk.c:207
msgid ""
"Usage: fdisk [-l] [-b SSZ] [-u] device\n"
"E.g.: fdisk /dev/hda (for the first IDE disk)\n"
@@ -1878,222 +2108,222 @@ msgstr ""
" eller: fdisk /dev/rd/c0d0 eller: fdisk /dev/ida/c0d0 (for RAID-enheder)\n"
" ...\n"
-#: fdisk/fdisk.c:215
+#: fdisk/fdisk.c:216
#, c-format
msgid "Unable to open %s\n"
msgstr "Kunne ikke åbne %s\n"
-#: fdisk/fdisk.c:219
+#: fdisk/fdisk.c:220
#, c-format
msgid "Unable to read %s\n"
msgstr "Kunne ikke læse %s\n"
-#: fdisk/fdisk.c:223
+#: fdisk/fdisk.c:224
#, c-format
msgid "Unable to seek on %s\n"
msgstr "Kunne ikke søge til %s\n"
-#: fdisk/fdisk.c:227
+#: fdisk/fdisk.c:228
#, c-format
msgid "Unable to write %s\n"
msgstr "Kunne ikke skrive %s\n"
-#: fdisk/fdisk.c:231
+#: fdisk/fdisk.c:232
#, c-format
msgid "BLKGETSIZE ioctl failed on %s\n"
msgstr "BLKGETSIZE ioctl mislykkedes på %s\n"
-#: fdisk/fdisk.c:235
+#: fdisk/fdisk.c:236
msgid "Unable to allocate any more memory\n"
msgstr "Kunne ikke allokere mere hukommelse\n"
-#: fdisk/fdisk.c:238
+#: fdisk/fdisk.c:239
msgid "Fatal error\n"
msgstr "Fatal fejl\n"
-#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:359 fdisk/fdisk.c:366
-#: fdisk/fdisk.c:389 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:439
-#: fdisk/fdiskbsdlabel.c:124
+#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:360 fdisk/fdisk.c:367
+#: fdisk/fdisk.c:390 fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:440
+#: fdisk/fdiskbsdlabel.c:129
msgid "Command action"
msgstr "Kommando beskrivelse"
-#: fdisk/fdisk.c:323
+#: fdisk/fdisk.c:324
msgid " a toggle a read only flag"
msgstr " a skift et skrivebeskyttelses-flag"
#. sun
-#: fdisk/fdisk.c:324 fdisk/fdisk.c:368
+#: fdisk/fdisk.c:325 fdisk/fdisk.c:369
msgid " b edit bsd disklabel"
msgstr " b skift bsd-diskmærkat"
-#: fdisk/fdisk.c:325
+#: fdisk/fdisk.c:326
msgid " c toggle the mountable flag"
msgstr " c skift montérbart-flag"
#. sun
-#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:370
+#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:371
msgid " d delete a partition"
msgstr " d slet en partition"
-#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:371
+#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:372
msgid " l list known partition types"
msgstr " l vis liste over kendte partitionstyper"
#. sun
-#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:360 fdisk/fdisk.c:372
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
-#: fdisk/fdiskbsdlabel.c:129
+#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:361 fdisk/fdisk.c:373
+#: fdisk/fdisk.c:398 fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
+#: fdisk/fdiskbsdlabel.c:134
msgid " m print this menu"
msgstr " m vis denne menu"
-#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
+#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374
msgid " n add a new partition"
msgstr " n tilføj en ny partition"
-#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:361 fdisk/fdisk.c:374
+#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:362 fdisk/fdisk.c:375
msgid " o create a new empty DOS partition table"
msgstr " o opret en ny, tom DOS-partitionstabel"
-#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:375 fdisk/fdisk.c:398
-#: fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:376 fdisk/fdisk.c:399
+#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
msgid " p print the partition table"
msgstr " p vis partitionstabellen"
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:362 fdisk/fdisk.c:376
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
-#: fdisk/fdiskbsdlabel.c:132
+#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:363 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:450
+#: fdisk/fdiskbsdlabel.c:137
msgid " q quit without saving changes"
msgstr " q afslut uden at gemme ændringerne"
-#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:363 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:364 fdisk/fdisk.c:378
msgid " s create a new empty Sun disklabel"
msgstr " s opret en ny, tom Sun-diskmærkat"
#. sun
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
msgid " t change a partition's system id"
msgstr " t skift system-id for en partition"
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
msgid " u change display/entry units"
msgstr " u skift enheder for visning/indtastning"
-#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380 fdisk/fdisk.c:402
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:452
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381 fdisk/fdisk.c:403
+#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
msgid " v verify the partition table"
msgstr " v verificér partitionstabellen"
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381 fdisk/fdisk.c:403
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:382 fdisk/fdisk.c:404
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
msgid " w write table to disk and exit"
msgstr " w skriv partitionstabel til disk og afslut"
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:383
msgid " x extra functionality (experts only)"
msgstr " x ekstra funktionalitet (kun for eksperter)"
-#: fdisk/fdisk.c:342
+#: fdisk/fdisk.c:343
msgid " a select bootable partition"
msgstr " a vælg en opstartbar partition"
#. sgi flavour
-#: fdisk/fdisk.c:343
+#: fdisk/fdisk.c:344
msgid " b edit bootfile entry"
msgstr " b redigér indgang i opstartsfil"
#. sgi
-#: fdisk/fdisk.c:344
+#: fdisk/fdisk.c:345
msgid " c select sgi swap partition"
msgstr " c vælg sgi swap-partition"
-#: fdisk/fdisk.c:367
+#: fdisk/fdisk.c:368
msgid " a toggle a bootable flag"
msgstr " a skift opstartbar-flaget"
-#: fdisk/fdisk.c:369
+#: fdisk/fdisk.c:370
msgid " c toggle the dos compatibility flag"
msgstr " c skift DOS-kompatilitets-flaget"
-#: fdisk/fdisk.c:390
+#: fdisk/fdisk.c:391
msgid " a change number of alternate cylinders"
msgstr " a ændr antallet af alternative cylindre"
#. sun
-#: fdisk/fdisk.c:391 fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:441
+#: fdisk/fdisk.c:392 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
msgid " c change number of cylinders"
msgstr " c ændr antallet af cylindre"
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:393 fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:443
msgid " d print the raw data in the partition table"
msgstr " d vis rådataene fra partitionstabellen"
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:394
msgid " e change number of extra sectors per cylinder"
msgstr " e ændr antallet af ekstra sektorer per cylinder"
#. sun
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:395 fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
msgid " h change number of heads"
msgstr " h ændr antallet af hoveder"
-#: fdisk/fdisk.c:395
+#: fdisk/fdisk.c:396
msgid " i change interleave factor"
msgstr " i ændr interleavefaktor"
#. sun
-#: fdisk/fdisk.c:396
+#: fdisk/fdisk.c:397
msgid " o change rotation speed (rpm)"
msgstr " o ændr rotationshastighed (omdr. per minut)"
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:450
-#: fdisk/fdiskbsdlabel.c:133
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:451
+#: fdisk/fdiskbsdlabel.c:138
msgid " r return to main menu"
msgstr " r returnér til hovedmenuen"
-#: fdisk/fdisk.c:401 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:452
msgid " s change number of sectors/track"
msgstr " s ændr antallet af sektorer/spor"
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:405
msgid " y change number of physical cylinders"
msgstr " y ændr antallet af fysiske cylindre"
-#: fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:440
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:441
msgid " b move beginning of data in a partition"
msgstr " b flyt starten på data i en partition"
-#: fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:443
+#: fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:444
msgid " e list extended partitions"
msgstr " e vis udvidede partitioner"
#. !sun
-#: fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
msgid " g create an IRIX (SGI) partition table"
msgstr " g opret en IRIX (SGI) partitionstabel"
#. !sun
-#: fdisk/fdisk.c:444
+#: fdisk/fdisk.c:445
msgid " f fix partition order"
msgstr " f ordn partitionsrækkefølgen"
-#: fdisk/fdisk.c:561
+#: fdisk/fdisk.c:562
msgid "You must set"
msgstr "Du skal angive"
-#: fdisk/fdisk.c:575
+#: fdisk/fdisk.c:576
msgid "heads"
msgstr "hoveder"
-#: fdisk/fdisk.c:577 fdisk/fdisk.c:1142 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:578 fdisk/fdisk.c:1154 fdisk/sfdisk.c:864
msgid "sectors"
msgstr "sektorer"
-#: fdisk/fdisk.c:579 fdisk/fdisk.c:1142 fdisk/fdiskbsdlabel.c:464
+#: fdisk/fdisk.c:580 fdisk/fdisk.c:1154 fdisk/fdiskbsdlabel.c:469
#: fdisk/sfdisk.c:864
msgid "cylinders"
msgstr "cylindre"
-#: fdisk/fdisk.c:583
+#: fdisk/fdisk.c:584
#, c-format
msgid ""
"%s%s.\n"
@@ -2102,11 +2332,11 @@ msgstr ""
"%s%s.\n"
"Dette kan du gøre fra menuen 'Ekstra funktioner'.\n"
-#: fdisk/fdisk.c:584
+#: fdisk/fdisk.c:585
msgid " and "
msgstr " og "
-#: fdisk/fdisk.c:601
+#: fdisk/fdisk.c:602
#, c-format
msgid ""
"\n"
@@ -2125,26 +2355,26 @@ msgstr ""
"2) opstarts- og partitioneringsprogrammer fra andre OS'er\n"
" (Bl.a. DOS FDISK og OS/2 FDISK)\n"
-#: fdisk/fdisk.c:624
+#: fdisk/fdisk.c:625
msgid "Bad offset in primary extended partition\n"
msgstr "Ugyldig forskydning i primær udvidet partition\n"
-#: fdisk/fdisk.c:638
+#: fdisk/fdisk.c:639
#, c-format
msgid "Warning: deleting partitions after %d\n"
msgstr "Advarsel: sletter partitioner efter %d\n"
-#: fdisk/fdisk.c:655
+#: fdisk/fdisk.c:656
#, c-format
msgid "Warning: extra link pointer in partition table %d\n"
msgstr "Advarsel: ekstra lænkepeger (link pointer) i partitionstabel %d\n"
-#: fdisk/fdisk.c:663
+#: fdisk/fdisk.c:664
#, c-format
msgid "Warning: ignoring extra data in partition table %d\n"
msgstr "Advarsel: ignorerer ekstra data i partitionstabel %d\n"
-#: fdisk/fdisk.c:708
+#: fdisk/fdisk.c:709
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"
@@ -2156,16 +2386,22 @@ msgstr ""
"indhold naturligvis ikke genskabes\n"
"\n"
-#: fdisk/fdisk.c:752
+#: fdisk/fdisk.c:753
#, c-format
msgid "Note: sector size is %d (not %d)\n"
msgstr "Bemærk: sektorstørrelsen er %d (ikke %d)\n"
-#: fdisk/fdisk.c:870
+#: fdisk/fdisk.c:883
msgid "You will not be able to write the partition table.\n"
msgstr "Du vil ikke kunne gemme partitionstabellen.\n"
-#: fdisk/fdisk.c:903
+#: fdisk/fdisk.c:914
+msgid ""
+"This disk has both DOS and BSD magic.\n"
+"Give the 'b' command to go to BSD mode.\n"
+msgstr ""
+
+#: fdisk/fdisk.c:924
msgid ""
"Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
"disklabel\n"
@@ -2173,16 +2409,16 @@ msgstr ""
"Enheden indeholder hverken en gyldig DOS-partitionstabel eller et Sun-, SGI- "
"eller OSF-diskmærkat.\n"
-#: fdisk/fdisk.c:920
+#: fdisk/fdisk.c:942
msgid "Internal error\n"
msgstr "Intern fejl\n"
-#: fdisk/fdisk.c:942
+#: fdisk/fdisk.c:954
#, c-format
msgid "Ignoring extra extended partition %d\n"
msgstr "Ignorerer ekstra udvidet partition %d\n"
-#: fdisk/fdisk.c:954
+#: fdisk/fdisk.c:966
#, c-format
msgid ""
"Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2191,7 +2427,7 @@ msgstr ""
"Advarsel: ugyldigt flag 0x%04x for partitionstabel %d vil blive rettet med "
"'w' (skriv)\n"
-#: fdisk/fdisk.c:976
+#: fdisk/fdisk.c:988
msgid ""
"\n"
"got EOF thrice - exiting..\n"
@@ -2199,65 +2435,65 @@ msgstr ""
"\n"
"fik filslut (EOF) tre gange - afslutter..\n"
-#: fdisk/fdisk.c:1015
+#: fdisk/fdisk.c:1027
msgid "Hex code (type L to list codes): "
msgstr "Hex-kode (tryk L for en liste over koderne): "
-#: fdisk/fdisk.c:1054
+#: fdisk/fdisk.c:1066
#, c-format
msgid "%s (%d-%d, default %d): "
msgstr "%s (%d-%d, standard %d): "
-#: fdisk/fdisk.c:1110
+#: fdisk/fdisk.c:1122
#, c-format
msgid "Using default value %d\n"
msgstr "Bruger standard-værdi %d\n"
-#: fdisk/fdisk.c:1114
+#: fdisk/fdisk.c:1126
msgid "Value out of range.\n"
msgstr "Værdi udenfor området.\n"
-#: fdisk/fdisk.c:1124
+#: fdisk/fdisk.c:1136
msgid "Partition number"
msgstr "Partitionsnummer"
-#: fdisk/fdisk.c:1133
+#: fdisk/fdisk.c:1145
#, c-format
msgid "Warning: partition %d has empty type\n"
msgstr "Advarsel: partition %d er af typen 'tom'\n"
-#: fdisk/fdisk.c:1140
+#: fdisk/fdisk.c:1152
msgid "cylinder"
msgstr "cylinder"
-#: fdisk/fdisk.c:1140
+#: fdisk/fdisk.c:1152
msgid "sector"
msgstr "sektor"
-#: fdisk/fdisk.c:1149
+#: fdisk/fdisk.c:1161
#, c-format
msgid "Changing display/entry units to %s\n"
msgstr "Skifter enheder for visning/indtastning til %s\n"
-#: fdisk/fdisk.c:1160
+#: fdisk/fdisk.c:1172
#, c-format
msgid "WARNING: Partition %d is an extended partition\n"
msgstr "ADVARSEL: Partition %d er en udvidet partition\n"
-#: fdisk/fdisk.c:1171
+#: fdisk/fdisk.c:1183
msgid "DOS Compatibility flag is set\n"
msgstr "DOS-kompatilitetsflag er sat\n"
-#: fdisk/fdisk.c:1175
+#: fdisk/fdisk.c:1187
msgid "DOS Compatibility flag is not set\n"
msgstr "DOS-kompatilitetsflag er ikke sat\n"
-#: fdisk/fdisk.c:1261
+#: fdisk/fdisk.c:1273
#, c-format
msgid "Partition %d does not exist yet!\n"
msgstr "Partition %d eksisterer ikke endnu!\n"
-#: fdisk/fdisk.c:1266
+#: fdisk/fdisk.c:1278
msgid ""
"Type 0 means free space to many systems\n"
"(but not to Linux). Having partitions of\n"
@@ -2269,7 +2505,7 @@ msgstr ""
"er nok uklogt. Du kan slette en partition med\n"
"'d'-kommandoen.\n"
-#: fdisk/fdisk.c:1275
+#: fdisk/fdisk.c:1287
msgid ""
"You cannot change a partition into an extended one or vice versa\n"
"Delete it first.\n"
@@ -2277,7 +2513,7 @@ msgstr ""
"Du kan ikke ændre en partition mellem at være udvidet eller ikke-udvidet\n"
"Slet den først.\n"
-#: fdisk/fdisk.c:1284
+#: fdisk/fdisk.c:1296
msgid ""
"Consider leaving partition 3 as Whole disk (5),\n"
"as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2287,7 +2523,7 @@ msgstr ""
"SunOS/Solaris forventer det og selv Linux foretrækker det.\n"
"\n"
-#: fdisk/fdisk.c:1290
+#: fdisk/fdisk.c:1302
msgid ""
"Consider leaving partition 9 as volume header (0),\n"
"and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2297,52 +2533,52 @@ msgstr ""
"og partition 11 som 'entire volume' (6), da IRIX forventer det.\n"
"\n"
-#: fdisk/fdisk.c:1303
+#: fdisk/fdisk.c:1315
#, c-format
msgid "Changed system type of partition %d to %x (%s)\n"
msgstr "Ændrede systemtypen for partition %d til %x (%s)\n"
-#: fdisk/fdisk.c:1357
+#: fdisk/fdisk.c:1369
#, c-format
msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
msgstr "Partition %d har forskellig fysisk/logisk begyndelse (ikke-Linux?):\n"
-#: fdisk/fdisk.c:1359 fdisk/fdisk.c:1367 fdisk/fdisk.c:1376 fdisk/fdisk.c:1385
+#: fdisk/fdisk.c:1371 fdisk/fdisk.c:1379 fdisk/fdisk.c:1388 fdisk/fdisk.c:1397
#, c-format
msgid " phys=(%d, %d, %d) "
msgstr " fys=(%d, %d, %d) "
-#: fdisk/fdisk.c:1360 fdisk/fdisk.c:1368
+#: fdisk/fdisk.c:1372 fdisk/fdisk.c:1380
#, c-format
msgid "logical=(%d, %d, %d)\n"
msgstr "logisk=(%d, %d, %d)\n"
-#: fdisk/fdisk.c:1365
+#: fdisk/fdisk.c:1377
#, c-format
msgid "Partition %d has different physical/logical endings:\n"
msgstr "Partition %d har forskellig fysisk/logisk endelse:\n"
-#: fdisk/fdisk.c:1374
+#: fdisk/fdisk.c:1386
#, c-format
msgid "Partition %i does not start on cylinder boundary:\n"
msgstr "Partition %i starter ikke på en cylinder-grænse:\n"
-#: fdisk/fdisk.c:1377
+#: fdisk/fdisk.c:1389
#, c-format
msgid "should be (%d, %d, 1)\n"
msgstr "burde være (%d, %d, 1)\n"
-#: fdisk/fdisk.c:1383
+#: fdisk/fdisk.c:1395
#, c-format
msgid "Partition %i does not end on cylinder boundary:\n"
msgstr "Partition %i slutter ikke på en cylinder-grænse:\n"
-#: fdisk/fdisk.c:1386
+#: fdisk/fdisk.c:1398
#, c-format
msgid "should be (%d, %d, %d)\n"
msgstr "burde være (%d, %d, %d)\n"
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1405
#, c-format
msgid ""
"\n"
@@ -2355,7 +2591,7 @@ msgstr ""
"Enheder = %s á %d * %d byte\n"
"\n"
-#: fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1513
msgid ""
"Nothing to do. Ordering is correct already.\n"
"\n"
@@ -2363,16 +2599,16 @@ msgstr ""
"Intet at gøre. Rækkefølgen er allerede korrekt.\n"
"\n"
-#: fdisk/fdisk.c:1565
+#: fdisk/fdisk.c:1577
#, c-format
msgid "%*s Boot Start End Blocks Id System\n"
msgstr "%*s Opstart Start Slut Blokke Id System\n"
-#: fdisk/fdisk.c:1566 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:675
+#: fdisk/fdisk.c:1578 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:675
msgid "Device"
msgstr "Enhed"
-#: fdisk/fdisk.c:1603
+#: fdisk/fdisk.c:1615
msgid ""
"\n"
"Partition table entries are not in disk order\n"
@@ -2380,7 +2616,7 @@ msgstr ""
"\n"
"Partitionstabellens indgange er ikke i disk-rækkefølge\n"
-#: fdisk/fdisk.c:1613
+#: fdisk/fdisk.c:1625
#, c-format
msgid ""
"\n"
@@ -2391,92 +2627,92 @@ msgstr ""
"Disk %s: %d hoveder, %d sektorer, %d cylindre\n"
"\n"
-#: fdisk/fdisk.c:1615
+#: fdisk/fdisk.c:1627
msgid "Nr AF Hd Sec Cyl Hd Sec Cyl Start Size ID\n"
msgstr "Nr AF Hvd Sekt Cyl Hvd Sekt Cyl Start Str. ID\n"
-#: fdisk/fdisk.c:1659
+#: fdisk/fdisk.c:1671
#, c-format
msgid "Warning: partition %d contains sector 0\n"
msgstr "Advarsel: partition %d indeholder sektor 0\n"
-#: fdisk/fdisk.c:1662
+#: fdisk/fdisk.c:1674
#, c-format
msgid "Partition %d: head %d greater than maximum %d\n"
msgstr "Partition %d: hovedet %d er større end de maksimale %d\n"
-#: fdisk/fdisk.c:1665
+#: fdisk/fdisk.c:1677
#, c-format
msgid "Partition %d: sector %d greater than maximum %d\n"
msgstr "Partition %d: sektor %d er større end de maksimale %d\n"
-#: fdisk/fdisk.c:1668
+#: fdisk/fdisk.c:1680
#, c-format
msgid "Partitions %d: cylinder %d greater than maximum %d\n"
msgstr "Partitionerne %d: cylinder %d større end de maksimale %d\n"
-#: fdisk/fdisk.c:1672
+#: fdisk/fdisk.c:1684
#, c-format
msgid "Partition %d: previous sectors %d disagrees with total %d\n"
msgstr "Partition %d: forrige sektorer %d stemmer ikke med totalen %d\n"
-#: fdisk/fdisk.c:1704
+#: fdisk/fdisk.c:1716
#, c-format
msgid "Warning: bad start-of-data in partition %d\n"
msgstr "Advarsel: ugyldig start-på-data i partition %d\n"
-#: fdisk/fdisk.c:1712
+#: fdisk/fdisk.c:1724
#, c-format
msgid "Warning: partition %d overlaps partition %d.\n"
msgstr "Advarsel: partition %d overlapper med partition %d.\n"
-#: fdisk/fdisk.c:1732
+#: fdisk/fdisk.c:1744
#, c-format
msgid "Warning: partition %d is empty\n"
msgstr "Advarsel: partition %d er tom\n"
-#: fdisk/fdisk.c:1737
+#: fdisk/fdisk.c:1749
#, c-format
msgid "Logical partition %d not entirely in partition %d\n"
msgstr "Logisk partition %d ikke fuldstændigt indenfor partition %d\n"
-#: fdisk/fdisk.c:1743
+#: fdisk/fdisk.c:1755
#, c-format
msgid "Total allocated sectors %d greater than the maximum %d\n"
msgstr "Allokerede sektorer i alt %d er større end de maksimale %d\n"
-#: fdisk/fdisk.c:1746
+#: fdisk/fdisk.c:1758
#, c-format
msgid "%d unallocated sectors\n"
msgstr "%d ikke-allokerede sektorer\n"
-#: fdisk/fdisk.c:1759 fdisk/fdisksgilabel.c:661 fdisk/fdisksunlabel.c:505
+#: fdisk/fdisk.c:1771 fdisk/fdisksgilabel.c:661 fdisk/fdisksunlabel.c:505
#, c-format
msgid "Partition %d is already defined. Delete it before re-adding it.\n"
msgstr ""
"Partition %d er allerede defineret. Slet den før du tilføjer den igen.\n"
-#: fdisk/fdisk.c:1780 fdisk/fdiskbsdlabel.c:279 fdisk/fdisksgilabel.c:683
+#: fdisk/fdisk.c:1792 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:683
#: fdisk/fdisksunlabel.c:520
#, c-format
msgid "First %s"
msgstr "Første %s"
-#: fdisk/fdisk.c:1795 fdisk/fdisksunlabel.c:561
+#: fdisk/fdisk.c:1807 fdisk/fdisksunlabel.c:561
#, c-format
msgid "Sector %d is already allocated\n"
msgstr "Sektor %d er allerede allokeret\n"
-#: fdisk/fdisk.c:1831
+#: fdisk/fdisk.c:1843
msgid "No free sectors available\n"
msgstr "Ingen tilgængelige frie sektorer\n"
-#: fdisk/fdisk.c:1840 fdisk/fdiskbsdlabel.c:286 fdisk/fdisksunlabel.c:572
+#: fdisk/fdisk.c:1852 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:572
#, c-format
msgid "Last %s or +size or +sizeM or +sizeK"
msgstr "Sidste %s eller +størrelse eller +størrelseM eller +størrelseK"
-#: fdisk/fdisk.c:1905
+#: fdisk/fdisk.c:1917
msgid ""
"\tSorry - this fdisk cannot handle AIX disk labels.\n"
"\tIf you want to add DOS-type partitions, create\n"
@@ -2488,15 +2724,15 @@ msgstr ""
"\ttilføje DOS-partitioner. (Brug o.)\n"
"\tADVARSEL: Dette vil ødelægge diskens nuværende indhold.\n"
-#: fdisk/fdisk.c:1914 fdisk/fdiskbsdlabel.c:613
+#: fdisk/fdisk.c:1926 fdisk/fdiskbsdlabel.c:617
msgid "The maximum number of partitions has been created\n"
msgstr "Det maksimale antal partitioner er blevet oprettet\n"
-#: fdisk/fdisk.c:1924
+#: fdisk/fdisk.c:1936
msgid "You must delete some partition and add an extended partition first\n"
msgstr "Du må først slette en partition og tilføje en udvidet partition\n"
-#: fdisk/fdisk.c:1929
+#: fdisk/fdisk.c:1941
#, c-format
msgid ""
"Command action\n"
@@ -2507,20 +2743,20 @@ msgstr ""
" %s\n"
" p primær partition (1-4)\n"
-#: fdisk/fdisk.c:1931
+#: fdisk/fdisk.c:1943
msgid "l logical (5 or over)"
msgstr "l logisk (5 eller derover)"
-#: fdisk/fdisk.c:1931
+#: fdisk/fdisk.c:1943
msgid "e extended"
msgstr "e udvidet"
-#: fdisk/fdisk.c:1948
+#: fdisk/fdisk.c:1960
#, c-format
msgid "Invalid partition number for type `%c'\n"
msgstr "Ugyldigt partitionsnummer for type '%c'\n"
-#: fdisk/fdisk.c:1984
+#: fdisk/fdisk.c:1996
msgid ""
"The partition table has been altered!\n"
"\n"
@@ -2528,11 +2764,11 @@ msgstr ""
"Partitionstabellen er ændret!\n"
"\n"
-#: fdisk/fdisk.c:1993
+#: fdisk/fdisk.c:2005
msgid "Calling ioctl() to re-read partition table.\n"
msgstr "Kalder ioctl() for at genindlæse partitionstabellen.\n"
-#: fdisk/fdisk.c:2009
+#: fdisk/fdisk.c:2021
#, c-format
msgid ""
"\n"
@@ -2545,7 +2781,7 @@ msgstr ""
"Denne kerne bruger stadig den gamle tabel.\n"
"Den nye tabel vil blive brugt fra næste genstart.\n"
-#: fdisk/fdisk.c:2019
+#: fdisk/fdisk.c:2031
msgid ""
"\n"
"WARNING: If you have created or modified any DOS 6.x\n"
@@ -2557,64 +2793,64 @@ msgstr ""
"yderligere information, hvis du har oprettet eller\n"
"ændret DOS 6.x partitioner.\n"
-#: fdisk/fdisk.c:2026
+#: fdisk/fdisk.c:2038
msgid "Syncing disks.\n"
msgstr "Synkroniserer diske.\n"
-#: fdisk/fdisk.c:2073
+#: fdisk/fdisk.c:2085
#, c-format
msgid "Partition %d has no data area\n"
msgstr "Partition %d har intet dataområde\n"
-#: fdisk/fdisk.c:2078
+#: fdisk/fdisk.c:2090
msgid "New beginning of data"
msgstr "Ny begyndelse på data"
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2106
msgid "Expert command (m for help): "
msgstr "Ekspert kommando (m for hjælp): "
-#: fdisk/fdisk.c:2107
+#: fdisk/fdisk.c:2119
msgid "Number of cylinders"
msgstr "Antal cylindre"
-#: fdisk/fdisk.c:2134
+#: fdisk/fdisk.c:2146
msgid "Number of heads"
msgstr "Antal hoveder"
-#: fdisk/fdisk.c:2159
+#: fdisk/fdisk.c:2171
msgid "Number of sectors"
msgstr "Antal sektorer"
-#: fdisk/fdisk.c:2162
+#: fdisk/fdisk.c:2174
msgid "Warning: setting sector offset for DOS compatiblity\n"
msgstr "Advarsel: sætter sektorforskydning for DOS-kompatilitet\n"
-#: fdisk/fdisk.c:2237
+#: fdisk/fdisk.c:2249
#, c-format
msgid "Disk %s doesn't contain a valid partition table\n"
msgstr "Disk %s indeholder ikke en gyldig partitionstabel\n"
-#: fdisk/fdisk.c:2251
+#: fdisk/fdisk.c:2263
#, c-format
msgid "Cannot open %s\n"
msgstr "Kunne ikke åbne %s\n"
-#: fdisk/fdisk.c:2267 fdisk/sfdisk.c:2363
+#: fdisk/fdisk.c:2279 fdisk/sfdisk.c:2363
#, c-format
msgid "cannot open %s\n"
msgstr "kunne ikke åbne %s\n"
-#: fdisk/fdisk.c:2289
+#: fdisk/fdisk.c:2301
#, c-format
msgid "%c: unknown command\n"
msgstr "%c: ukendt kommando\n"
-#: fdisk/fdisk.c:2339
+#: fdisk/fdisk.c:2351
msgid "This kernel finds the sector size itself - -b option ignored\n"
msgstr "Denne kerne finder selv sektorstørrelser - tilvalget -b ignoreres\n"
-#: fdisk/fdisk.c:2342
+#: fdisk/fdisk.c:2355
msgid ""
"Warning: the -b (set sector size) option should be used with one specified "
"device\n"
@@ -2622,20 +2858,19 @@ msgstr ""
"Advarsel: tilvalget -b (angiv sektorstørrelse) kræver angivelse af disk-"
"enhed\n"
-#: fdisk/fdisk.c:2405
-#, c-format
-msgid ""
-"Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
-"To return to DOS partition table mode, use the 'r' command.\n"
+#. OSF label, and no DOS label
+#: fdisk/fdisk.c:2414
+#, fuzzy, c-format
+msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
msgstr ""
"Detekterede et OSF/1 diskmærkat på %s. Går i diskmærkat-tilstand.\n"
"Brug 'r'-kommandoen for at returnere til DOS-partitionstabel-tilstand.\n"
-#: fdisk/fdisk.c:2413
+#: fdisk/fdisk.c:2424
msgid "Command (m for help): "
msgstr "Kommando (m for hjælp): "
-#: fdisk/fdisk.c:2429
+#: fdisk/fdisk.c:2440
#, c-format
msgid ""
"\n"
@@ -2644,15 +2879,15 @@ msgstr ""
"\n"
"Den nuværende opstartfil er: %s\n"
-#: fdisk/fdisk.c:2431
+#: fdisk/fdisk.c:2442
msgid "Please enter the name of the new boot file: "
msgstr "Angiv venligt navnet på den ny opstartsfil: "
-#: fdisk/fdisk.c:2433
+#: fdisk/fdisk.c:2444
msgid "Boot file unchanged\n"
msgstr "Opstartsfil uændret\n"
-#: fdisk/fdisk.c:2497
+#: fdisk/fdisk.c:2508
msgid ""
"\n"
"\tSorry, no experts menu for SGI partition tables available.\n"
@@ -2689,7 +2924,7 @@ msgstr ""
"\t at du fjerne disken logisk fra din AIX maskine.\n"
"\t (Ellers bliver du en AIXpert)."
-#: fdisk/fdiskbsdlabel.c:117
+#: fdisk/fdiskbsdlabel.c:122
#, c-format
msgid ""
"\n"
@@ -2698,167 +2933,167 @@ msgstr ""
"\n"
"BSD-mærkat for enhed: %s\n"
-#: fdisk/fdiskbsdlabel.c:125
+#: fdisk/fdiskbsdlabel.c:130
msgid " d delete a BSD partition"
msgstr " d slet en BSD-partition"
-#: fdisk/fdiskbsdlabel.c:126
+#: fdisk/fdiskbsdlabel.c:131
msgid " e edit drive data"
msgstr " e redigér drev-data"
-#: fdisk/fdiskbsdlabel.c:127
+#: fdisk/fdiskbsdlabel.c:132
msgid " i install bootstrap"
msgstr " i installer opstarts-igangsætter ('bootstrap')"
-#: fdisk/fdiskbsdlabel.c:128
+#: fdisk/fdiskbsdlabel.c:133
msgid " l list known filesystem types"
msgstr " l vis liste over filsystemtyper"
-#: fdisk/fdiskbsdlabel.c:130
+#: fdisk/fdiskbsdlabel.c:135
msgid " n add a new BSD partition"
msgstr " n tilføj en ny BSD-partition"
-#: fdisk/fdiskbsdlabel.c:131
+#: fdisk/fdiskbsdlabel.c:136
msgid " p print BSD partition table"
msgstr " p vis BSD-partitionstabel"
-#: fdisk/fdiskbsdlabel.c:134
+#: fdisk/fdiskbsdlabel.c:139
msgid " s show complete disklabel"
msgstr " s vis hele diskmærkatet"
-#: fdisk/fdiskbsdlabel.c:135
+#: fdisk/fdiskbsdlabel.c:140
msgid " t change a partition's filesystem id"
msgstr " t ændr filsystem-id for en partition"
-#: fdisk/fdiskbsdlabel.c:136
+#: fdisk/fdiskbsdlabel.c:141
msgid " u change units (cylinders/sectors)"
msgstr " u skift enheder (cylindre/sektorer)"
-#: fdisk/fdiskbsdlabel.c:137
+#: fdisk/fdiskbsdlabel.c:142
msgid " w write disklabel to disk"
msgstr " w skriv diskmærkatet til disken"
-#: fdisk/fdiskbsdlabel.c:139
+#: fdisk/fdiskbsdlabel.c:144
msgid " x link BSD partition to non-BSD partition"
msgstr " x lænk en BSD-partition til en ikke-BSD-partition"
-#: fdisk/fdiskbsdlabel.c:171
+#: fdisk/fdiskbsdlabel.c:176
#, c-format
msgid "Partition %s has invalid starting sector 0.\n"
msgstr "Partition %s har en ugyldig startsektor 0.\n"
-#: fdisk/fdiskbsdlabel.c:175
+#: fdisk/fdiskbsdlabel.c:180
#, c-format
msgid "Reading disklabel of %s at sector %d.\n"
msgstr "Læser diskmærkat for %s fra sektor %d.\n"
-#: fdisk/fdiskbsdlabel.c:185
+#: fdisk/fdiskbsdlabel.c:190
#, c-format
msgid "There is no *BSD partition on %s.\n"
msgstr "Der er ingen *BSD-partitioner på %s.\n"
-#: fdisk/fdiskbsdlabel.c:199
+#: fdisk/fdiskbsdlabel.c:204
msgid "BSD disklabel command (m for help): "
msgstr "BSD-diskmærkat kommando (m for hjælp): "
-#: fdisk/fdiskbsdlabel.c:313
+#: fdisk/fdiskbsdlabel.c:318
#, c-format
msgid "type: %s\n"
msgstr "type: %s\n"
-#: fdisk/fdiskbsdlabel.c:315
+#: fdisk/fdiskbsdlabel.c:320
#, c-format
msgid "type: %d\n"
msgstr "type: %d\n"
-#: fdisk/fdiskbsdlabel.c:316
+#: fdisk/fdiskbsdlabel.c:321
#, c-format
msgid "disk: %.*s\n"
msgstr "disk: %.*s\n"
-#: fdisk/fdiskbsdlabel.c:317
+#: fdisk/fdiskbsdlabel.c:322
#, c-format
msgid "label: %.*s\n"
msgstr "mærkat: %.*s\n"
-#: fdisk/fdiskbsdlabel.c:318
+#: fdisk/fdiskbsdlabel.c:323
msgid "flags:"
msgstr "flag:"
-#: fdisk/fdiskbsdlabel.c:320
+#: fdisk/fdiskbsdlabel.c:325
msgid " removable"
msgstr " flytbar"
-#: fdisk/fdiskbsdlabel.c:322
+#: fdisk/fdiskbsdlabel.c:327
msgid " ecc"
msgstr " ecc"
-#: fdisk/fdiskbsdlabel.c:324
+#: fdisk/fdiskbsdlabel.c:329
msgid " badsect"
msgstr " fjlsekt"
#. On various machines the fields of *lp are short/int/long
#. In order to avoid problems, we cast them all to long.
-#: fdisk/fdiskbsdlabel.c:328
+#: fdisk/fdiskbsdlabel.c:333
#, c-format
msgid "bytes/sector: %ld\n"
msgstr "byte/sektor: %ld\n"
-#: fdisk/fdiskbsdlabel.c:329
+#: fdisk/fdiskbsdlabel.c:334
#, c-format
msgid "sectors/track: %ld\n"
msgstr "sektorer/spor: %ld\n"
-#: fdisk/fdiskbsdlabel.c:330
+#: fdisk/fdiskbsdlabel.c:335
#, c-format
msgid "tracks/cylinder: %ld\n"
msgstr "spor/cylinder: %ld\n"
-#: fdisk/fdiskbsdlabel.c:331
+#: fdisk/fdiskbsdlabel.c:336
#, c-format
msgid "sectors/cylinder: %ld\n"
msgstr "sektorer/cylinder: %ld\n"
-#: fdisk/fdiskbsdlabel.c:332
+#: fdisk/fdiskbsdlabel.c:337
#, c-format
msgid "cylinders: %ld\n"
msgstr "cylindre: %ld\n"
-#: fdisk/fdiskbsdlabel.c:333
+#: fdisk/fdiskbsdlabel.c:338
#, c-format
msgid "rpm: %d\n"
msgstr "omdr. per minut: %d\n"
-#: fdisk/fdiskbsdlabel.c:334
+#: fdisk/fdiskbsdlabel.c:339
#, c-format
msgid "interleave: %d\n"
msgstr "interleave: %d\n"
-#: fdisk/fdiskbsdlabel.c:335
+#: fdisk/fdiskbsdlabel.c:340
#, c-format
msgid "trackskew: %d\n"
msgstr "sporafvigelse: %d\n"
-#: fdisk/fdiskbsdlabel.c:336
+#: fdisk/fdiskbsdlabel.c:341
#, c-format
msgid "cylinderskew: %d\n"
msgstr "cylinderafvigelse: %d\n"
-#: fdisk/fdiskbsdlabel.c:337
+#: fdisk/fdiskbsdlabel.c:342
#, c-format
msgid "headswitch: %ld\t\t# milliseconds\n"
msgstr "hovedskift: %ld\t\t# millisekunder\n"
-#: fdisk/fdiskbsdlabel.c:339
+#: fdisk/fdiskbsdlabel.c:344
#, c-format
msgid "track-to-track seek: %ld\t# milliseconds\n"
msgstr "spor-til-spor søgning: %ld\t# millisekunder\n"
-#: fdisk/fdiskbsdlabel.c:341
+#: fdisk/fdiskbsdlabel.c:346
msgid "drivedata: "
msgstr "drevdata: "
-#: fdisk/fdiskbsdlabel.c:350
+#: fdisk/fdiskbsdlabel.c:355
#, c-format
msgid ""
"\n"
@@ -2867,97 +3102,97 @@ msgstr ""
"\n"
"%d partitioner:\n"
-#: fdisk/fdiskbsdlabel.c:351
+#: fdisk/fdiskbsdlabel.c:356
msgid "# start end size fstype [fsize bsize cpg]\n"
msgstr "# start slut størr. fstype [fstr. bstr. cpg]\n"
-#: fdisk/fdiskbsdlabel.c:400 fdisk/fdiskbsdlabel.c:403
+#: fdisk/fdiskbsdlabel.c:405 fdisk/fdiskbsdlabel.c:408
#, c-format
msgid "Writing disklabel to %s.\n"
msgstr "Skiver diskmærkat til %s.\n"
-#: fdisk/fdiskbsdlabel.c:415 fdisk/fdiskbsdlabel.c:417
+#: fdisk/fdiskbsdlabel.c:420 fdisk/fdiskbsdlabel.c:422
#, c-format
msgid "%s contains no disklabel.\n"
msgstr "%s har intet diskmærkat.\n"
-#: fdisk/fdiskbsdlabel.c:422
+#: fdisk/fdiskbsdlabel.c:427
msgid "Do you want to create a disklabel? (y/n) "
msgstr "Vil du oprette et diskmærkat? (j/n) "
-#: fdisk/fdiskbsdlabel.c:461
+#: fdisk/fdiskbsdlabel.c:466
msgid "bytes/sector"
msgstr "byte/sektor"
-#: fdisk/fdiskbsdlabel.c:462
+#: fdisk/fdiskbsdlabel.c:467
msgid "sectors/track"
msgstr "sektorer/spor"
-#: fdisk/fdiskbsdlabel.c:463
+#: fdisk/fdiskbsdlabel.c:468
msgid "tracks/cylinder"
msgstr "spor/cylinder"
-#: fdisk/fdiskbsdlabel.c:471
+#: fdisk/fdiskbsdlabel.c:476
msgid "sectors/cylinder"
msgstr "sektorer/cylinder"
-#: fdisk/fdiskbsdlabel.c:475
+#: fdisk/fdiskbsdlabel.c:480
msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
msgstr "Skal være <= sektorer/spor * spor/cylinder (standard).\n"
-#: fdisk/fdiskbsdlabel.c:477
+#: fdisk/fdiskbsdlabel.c:482
msgid "rpm"
msgstr "omdr. per minut"
-#: fdisk/fdiskbsdlabel.c:478
+#: fdisk/fdiskbsdlabel.c:483
msgid "interleave"
msgstr "interleave"
-#: fdisk/fdiskbsdlabel.c:479
+#: fdisk/fdiskbsdlabel.c:484
msgid "trackskew"
msgstr "sporafvigelse"
-#: fdisk/fdiskbsdlabel.c:480
+#: fdisk/fdiskbsdlabel.c:485
msgid "cylinderskew"
msgstr "cylinderafvigelse"
-#: fdisk/fdiskbsdlabel.c:481
+#: fdisk/fdiskbsdlabel.c:486
msgid "headswitch"
msgstr "hovedskift"
-#: fdisk/fdiskbsdlabel.c:482
+#: fdisk/fdiskbsdlabel.c:487
msgid "track-to-track seek"
msgstr "spor-til-spor søgning"
-#: fdisk/fdiskbsdlabel.c:523
+#: fdisk/fdiskbsdlabel.c:528
#, c-format
msgid "Bootstrap: %sboot -> boot%s (%s): "
msgstr "Opstarts-igangsætter: %sopstart -> opstart%s (%s): "
-#: fdisk/fdiskbsdlabel.c:548
+#: fdisk/fdiskbsdlabel.c:553
msgid "Bootstrap overlaps with disk label!\n"
msgstr "Opstarts-igangsætter overlapper med diskmærkatet!\n"
-#: fdisk/fdiskbsdlabel.c:569 fdisk/fdiskbsdlabel.c:571
+#: fdisk/fdiskbsdlabel.c:574 fdisk/fdiskbsdlabel.c:576
#, c-format
msgid "Bootstrap installed on %s.\n"
msgstr "Opstarts-igangsætter installeret på %s.\n"
-#: fdisk/fdiskbsdlabel.c:593
+#: fdisk/fdiskbsdlabel.c:598
#, c-format
msgid "Partition (a-%c): "
msgstr "Partition (a-%c): "
-#: fdisk/fdiskbsdlabel.c:624
+#: fdisk/fdiskbsdlabel.c:629
msgid "This partition already exists.\n"
msgstr "Denne partition eksisterer allerede.\n"
-#: fdisk/fdiskbsdlabel.c:744
+#: fdisk/fdiskbsdlabel.c:755
#, c-format
msgid "Warning: too many partitions (%d, maximum is %d).\n"
msgstr "Advarsel: for mange partitioner (%d, maksimum er %d).\n"
-#: fdisk/fdiskbsdlabel.c:791
+#: fdisk/fdiskbsdlabel.c:803
msgid ""
"\n"
"Syncing disks.\n"
@@ -4888,134 +5123,120 @@ msgstr "getopt (udvidet) 1.1.2\n"
msgid "internal error, contact the author."
msgstr "intern fejl, kontakt programmøren."
-#: hwclock/cmos.c:168
+#: hwclock/cmos.c:172
msgid "booted from MILO\n"
msgstr "startede op med MILO\n"
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:181
msgid "Ruffian BCD clock\n"
msgstr "'Ruffian' BCD-ur\n"
-#: hwclock/cmos.c:193
+#: hwclock/cmos.c:197
#, c-format
msgid "clockport adjusted to 0x%x\n"
msgstr "urport justeret til 0x%x\n"
-#: hwclock/cmos.c:205
+#: hwclock/cmos.c:209
msgid "funky TOY!\n"
msgstr "'funky TOY' (tid-på-året)!\n"
-#: hwclock/cmos.c:259
+#: hwclock/cmos.c:263
#, c-format
msgid "%s: atomic %s failed for 1000 iterations!"
msgstr "%s: momentan %s mislykkedes i 1000 iterationer!"
-#: hwclock/cmos.c:583
+#: hwclock/cmos.c:587
#, c-format
msgid "Cannot open /dev/port: %s"
msgstr "Kan ikke åbne /dev/port: %s"
-#: hwclock/cmos.c:590
+#: hwclock/cmos.c:594
msgid "I failed to get permission because I didn't try.\n"
msgstr "Jeg kunne ikke få adgang fordi jeg ikke forsøgte.\n"
-#: hwclock/cmos.c:593
+#: hwclock/cmos.c:597
#, c-format
msgid "%s is unable to get I/O port access: the iopl(3) call failed.\n"
msgstr "%s kan ikke få adgang til I/O-port: kaldet 'iopl(3)' mislykkedes.\n"
-#: hwclock/cmos.c:596
+#: hwclock/cmos.c:600
msgid "Probably you need root privileges.\n"
msgstr "Du behøver nok root-rettigheder.\n"
-#: hwclock/hwclock.c:219
+#: hwclock/hwclock.c:223
#, c-format
msgid "Assuming hardware clock is kept in %s time.\n"
msgstr "Antager at maskinuret holdes i %s tid.\n"
-#: hwclock/hwclock.c:220 hwclock/hwclock.c:314
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
msgid "UTC"
msgstr "GMT"
-#: hwclock/hwclock.c:220 hwclock/hwclock.c:313
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
msgid "local"
msgstr "lokal"
-#: hwclock/hwclock.c:297
+#: hwclock/hwclock.c:303
#, c-format
msgid "%s: Warning: unrecognized third line in adjtime file\n"
msgstr "%s: Advarsel: ukendt tredie linje i adjtime-fil\n"
-#: hwclock/hwclock.c:299
+#: hwclock/hwclock.c:305
msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
msgstr "(Forventet: 'UTC' (GMT), 'LOCAL' eller ingenting.)\n"
-#: hwclock/hwclock.c:308
+#: hwclock/hwclock.c:312
#, c-format
msgid "Last drift adjustment done at %ld seconds after 1969\n"
msgstr "Sidste hastighedsjustering blev gjort %ld sekunder efter 1969\n"
-#: hwclock/hwclock.c:310
+#: hwclock/hwclock.c:314
#, c-format
msgid "Last calibration done at %ld seconds after 1969\n"
msgstr "Sidste kalibrering blev foretaget %ld sekunder efter 1969\n"
-#: hwclock/hwclock.c:312
+#: hwclock/hwclock.c:316
#, c-format
msgid "Hardware clock is on %s time\n"
msgstr "Maskinuret er i %s-tid\n"
-#: hwclock/hwclock.c:314
+#: hwclock/hwclock.c:318
msgid "unknown"
msgstr "ukendt"
-#. -----------------------------------------------------------------------------
-#. 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.
-#.
-#. -----------------------------------------------------------------------------
-#: hwclock/hwclock.c:336
+#: hwclock/hwclock.c:342
msgid "Waiting for clock tick...\n"
msgstr "Venter på et ur-tik...\n"
-#: hwclock/hwclock.c:340
+#: hwclock/hwclock.c:346
msgid "...got clock tick\n"
msgstr "...fangede ur-tik\n"
-#: hwclock/hwclock.c:391
+#: hwclock/hwclock.c:399
#, c-format
msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
msgstr "Ugyldige værdier i maskinur: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
-#: hwclock/hwclock.c:399
+#: hwclock/hwclock.c:407
#, c-format
msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
msgstr "Maskinur-tid: %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld sekunder siden 1969\n"
-#: hwclock/hwclock.c:427
+#: hwclock/hwclock.c:435
#, c-format
msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
msgstr "Tid læst fra maskinuret: %4d/%.2d/%.2d %02d:%02d:%02d\n"
-#: hwclock/hwclock.c:454
+#: hwclock/hwclock.c:462
#, c-format
msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
msgstr "Sætter maskinuret til %.2d:%.2d:%.2d = %ld sekunder siden 1969\n"
-#: hwclock/hwclock.c:460
+#: hwclock/hwclock.c:468
msgid "Clock not changed - testing only.\n"
msgstr "Uret uændret - testede kun.\n"
-#: hwclock/hwclock.c:508
+#: hwclock/hwclock.c:516
#, c-format
msgid ""
"Time elapsed since reference time has been %.6f seconds.\n"
@@ -5024,7 +5245,7 @@ msgstr ""
"Der er gået %.6f sekunder siden referencetiden.\n"
"Udskyder yderligere for at nå til næste hele sekund.\n"
-#: hwclock/hwclock.c:532
+#: hwclock/hwclock.c:540
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"
@@ -5032,20 +5253,20 @@ msgstr ""
"Maskinurets registre indeholder værdier, der enten er ugyldige (f.eks. 50. "
"dag i måneden) eller udenfor det område, vi kan håndtere (f.eks. år 2095).\n"
-#: hwclock/hwclock.c:542
+#: hwclock/hwclock.c:550
#, c-format
msgid "%s %.6f seconds\n"
msgstr "%s %.6f sekunder\n"
-#: hwclock/hwclock.c:576
+#: hwclock/hwclock.c:584
msgid "No --date option specified.\n"
msgstr "Intet --date tilvalg angivet.\n"
-#: hwclock/hwclock.c:582
+#: hwclock/hwclock.c:590
msgid "--date argument too long\n"
msgstr "parametret til --date er for langt\n"
-#: hwclock/hwclock.c:589
+#: hwclock/hwclock.c:597
msgid ""
"The value of the --date option is not a valid date.\n"
"In particular, it contains quotation marks.\n"
@@ -5053,22 +5274,22 @@ msgstr ""
"Værdien af --date tilvalget er ikke en gyldig dato.\n"
"Mere specifikt, indeholder den anførselstegn.\n"
-#: hwclock/hwclock.c:597
+#: hwclock/hwclock.c:605
#, c-format
msgid "Issuing date command: %s\n"
msgstr "Udfører 'date'-kommandoen: %s\n"
-#: hwclock/hwclock.c:601
+#: hwclock/hwclock.c:609
msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
msgstr ""
"Kunne ikke køre 'date'-programmet i /bin/sh skallen. popen() mislykkedes"
-#: hwclock/hwclock.c:609
+#: hwclock/hwclock.c:617
#, c-format
msgid "response from date command = %s\n"
msgstr "svar fra 'date'-kommandoen = %s\n"
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:619
#, c-format
msgid ""
"The date command issued by %s returned unexpected results.\n"
@@ -5083,7 +5304,7 @@ msgstr ""
"Svaret var:\n"
" %s\n"
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:631
#, c-format
msgid ""
"The date command issued by %s returned something other than an integer where "
@@ -5100,12 +5321,12 @@ msgstr ""
"Svaret var:\n"
" %s\n"
-#: hwclock/hwclock.c:634
+#: hwclock/hwclock.c:642
#, c-format
msgid "date string %s equates to %ld seconds since 1969.\n"
msgstr "Datoteksten %s svarer til %ld sekunder siden 1969.\n"
-#: hwclock/hwclock.c:666
+#: hwclock/hwclock.c:674
msgid ""
"The Hardware Clock does not contain a valid time, so we cannot set the "
"System Time from it.\n"
@@ -5113,33 +5334,33 @@ msgstr ""
"Maskinuret indeholder ikke en gyldig tid, så vi kan ikke sætte systemuret "
"med det.\n"
-#: hwclock/hwclock.c:688
+#: hwclock/hwclock.c:696
msgid "Calling settimeofday:\n"
msgstr "Kalder 'settimeofday':\n"
-#: hwclock/hwclock.c:689
+#: hwclock/hwclock.c:697
#, c-format
msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
-#: hwclock/hwclock.c:691
+#: hwclock/hwclock.c:699
#, c-format
msgid "\ttz.tz_minuteswest = %d\n"
msgstr "\ttz.tz_minuteswest = %d\n"
-#: hwclock/hwclock.c:694
+#: hwclock/hwclock.c:702
msgid "Not setting system clock because running in test mode.\n"
msgstr "Sætter ikke systemuret, da der køres i testtilstand.\n"
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:711
msgid "Must be superuser to set system clock.\n"
msgstr "Skal være superbruger for at sætte systemuret.\n"
-#: hwclock/hwclock.c:704
+#: hwclock/hwclock.c:714
msgid "settimeofday() failed"
msgstr "settimeofday() mislykkedes"
-#: hwclock/hwclock.c:737
+#: hwclock/hwclock.c:744
msgid ""
"Not adjusting drift factor because the Hardware Clock previously contained "
"garbage.\n"
@@ -5147,7 +5368,16 @@ msgstr ""
"Justerede ikke hastighedsfaktoren, da maskinuret tidligere havde en ugyldig "
"værdi.\n"
-#: hwclock/hwclock.c:741
+#: hwclock/hwclock.c:749
+#, fuzzy
+msgid ""
+"Not adjusting drift factor because last calibration time is zero,\n"
+"so history is bad and calibration startover is necessary.\n"
+msgstr ""
+"Justerede ikke hastighedsfaktoren, da det er mindre en et døgn siden sidste "
+"kalibrering.\n"
+
+#: hwclock/hwclock.c:755
msgid ""
"Not adjusting drift factor because it has been less than a day since the "
"last calibration.\n"
@@ -5155,10 +5385,10 @@ msgstr ""
"Justerede ikke hastighedsfaktoren, da det er mindre en et døgn siden sidste "
"kalibrering.\n"
-#: hwclock/hwclock.c:750
-#, c-format
+#: hwclock/hwclock.c:803
+#, fuzzy, c-format
msgid ""
-"Clock drifted %d seconds in the past %d seconds in spite of a drift factor "
+"Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
"of %f seconds/day.\n"
"Adjusting drift factor by %f seconds/day\n"
msgstr ""
@@ -5166,21 +5396,21 @@ msgstr ""
"hastighedsfaktor på %f sekunder/døgn.\n"
"Justerer hastighedsfaktoren med %f sekunder/døgn\n"
-#: hwclock/hwclock.c:801
+#: hwclock/hwclock.c:854
#, c-format
msgid "Time since last adjustment is %d seconds\n"
msgstr "%d sekunder siden sidste justering\n"
-#: hwclock/hwclock.c:803
+#: hwclock/hwclock.c:856
#, c-format
msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
msgstr "Skal indsætte %d sekunder og stille uret %.6f sekunder tilbage\n"
-#: hwclock/hwclock.c:832
+#: hwclock/hwclock.c:885
msgid "Not updating adjtime file because of testing mode.\n"
msgstr "Opdaterer ikke adjtime-filen, da der køres i testtilstand.\n"
-#: hwclock/hwclock.c:833
+#: hwclock/hwclock.c:886
#, c-format
msgid ""
"Would have written the following to %s:\n"
@@ -5189,35 +5419,35 @@ msgstr ""
"Ville have skrevet følgende til %s:\n"
"%s"
-#: hwclock/hwclock.c:857
+#: hwclock/hwclock.c:910
msgid "Drift adjustment parameters not updated.\n"
msgstr "Hastighedsjusteringen blev ikke opdateret.\n"
-#: hwclock/hwclock.c:898
+#: hwclock/hwclock.c:951
msgid ""
"The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
msgstr ""
"Maskinuret indeholder ikke en gyldig tid, så vi kan ikke justere det.\n"
-#: hwclock/hwclock.c:922
+#: hwclock/hwclock.c:983
msgid "Needed adjustment is less than one second, so not setting clock.\n"
msgstr ""
"Den krævede justering er mindre end ét sekund, så vi sætter ikke uret.\n"
-#: hwclock/hwclock.c:948
+#: hwclock/hwclock.c:1009
#, c-format
msgid "Using %s.\n"
msgstr "Bruger %s.\n"
-#: hwclock/hwclock.c:950
+#: hwclock/hwclock.c:1011
msgid "No usable clock interface found.\n"
msgstr "Fandt ingen brugbare ur-grænseflader.\n"
-#: hwclock/hwclock.c:1045
+#: hwclock/hwclock.c:1107
msgid "Unable to set system clock.\n"
msgstr "Kunne ikke sætte systemuret.\n"
-#: hwclock/hwclock.c:1076
+#: hwclock/hwclock.c:1137
msgid ""
"The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
"machine.\n"
@@ -5228,16 +5458,16 @@ msgstr ""
"Denne kopi af hwclock blev kompileret til en anden maskine end Alpha\n"
"(og kører derfor sandsynligvis ikke på en Alpha nu). Intet blev gjort.\n"
-#: hwclock/hwclock.c:1085
+#: hwclock/hwclock.c:1146
msgid "Unable to get the epoch value from the kernel.\n"
msgstr "Kunne ikke hente en epokeværdi fra kernen.\n"
-#: hwclock/hwclock.c:1087
+#: hwclock/hwclock.c:1148
#, c-format
msgid "Kernel is assuming an epoch value of %lu\n"
msgstr "Kernen går ud fra en epokeværdi på %lu\n"
-#: hwclock/hwclock.c:1090
+#: hwclock/hwclock.c:1151
msgid ""
"To set the epoch value, you must use the 'epoch' option to tell to what "
"value to set it.\n"
@@ -5245,16 +5475,16 @@ msgstr ""
"For at sætte epokeværdien, skal du bruge tilvalget 'epoch' for at angive "
"hvilken værdi, den skal sættes til\n"
-#: hwclock/hwclock.c:1093
+#: hwclock/hwclock.c:1154
#, c-format
msgid "Not setting the epoch to %d - testing only.\n"
msgstr "Sætter IKKE epokeværdien til %d - tester bare.\n"
-#: hwclock/hwclock.c:1096
+#: hwclock/hwclock.c:1157
msgid "Unable to set the epoch value in the kernel.\n"
msgstr "Kunne ikke sætte epokeværdien i kernen.\n"
-#: hwclock/hwclock.c:1125
+#: hwclock/hwclock.c:1191
#, c-format
msgid ""
"hwclock - query and set the hardware clock (RTC)\n"
@@ -5313,7 +5543,7 @@ msgstr ""
" --noadjfile tilgå ikke /etc/adjtime. Det kræver, at der bruges\n"
" enten --utc eller --localtime\n"
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1218
msgid ""
" --jensen, --arc, --srm, --funky-toy\n"
" tell hwclock the type of alpha you have (see hwclock(8))\n"
@@ -5321,20 +5551,21 @@ msgstr ""
" --jensen, --arc, --srm, --funky-toy\n"
" angiv hvilken slags alpha du har (se hwclock(8))\n"
-#: hwclock/hwclock.c:1257
+#: hwclock/hwclock.c:1392
#, c-format
msgid "%s takes no non-option arguments. You supplied %d.\n"
msgstr "%s accepterer ingen parametre. Du angav parameteren %d.\n"
-#: hwclock/hwclock.c:1267
+#: hwclock/hwclock.c:1398
+#, fuzzy
msgid ""
-"You have specified multiple function options.\n"
+"You have specified multiple functions.\n"
"You can only perform one function at a time.\n"
msgstr ""
"Du har angivet flere funktionstilvalg.\n"
"Du kan kun udføre én funktion ad gangen.\n"
-#: hwclock/hwclock.c:1273
+#: hwclock/hwclock.c:1405
#, c-format
msgid ""
"%s: The --utc and --localtime options are mutually exclusive. You specified "
@@ -5342,7 +5573,7 @@ msgid ""
msgstr ""
"%s: Tilvalgene --utc og --localtime udelukker hinanden. Du angav begge.\n"
-#: hwclock/hwclock.c:1279
+#: hwclock/hwclock.c:1412
#, c-format
msgid ""
"%s: The --adjust and --noadjfile options are mutually exclusive. You "
@@ -5350,35 +5581,35 @@ msgid ""
msgstr ""
"%s: Tilvalgene --adjust og --noadjfile udelukker hinanden. Du angav begge.\n"
-#: hwclock/hwclock.c:1285
+#: hwclock/hwclock.c:1419
#, c-format
msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
msgstr "%s: --noadjfile kræver enten --utc or --localtime\n"
-#: hwclock/hwclock.c:1298
+#: hwclock/hwclock.c:1433
msgid "No usable set-to time. Cannot set clock.\n"
msgstr "Ingen brugbar set-til-tid. Kan ikke sætte uret.\n"
-#: hwclock/hwclock.c:1313
+#: hwclock/hwclock.c:1449
msgid "Sorry, only the superuser can change the Hardware Clock.\n"
msgstr "Beklager, kun superbrugeren kan ændre maskinuret.\n"
-#: hwclock/hwclock.c:1317
+#: hwclock/hwclock.c:1454
msgid "Sorry, only the superuser can change the System Clock.\n"
msgstr "Beklager, kun superbrugeren kan ændre systemuret.\n"
-#: hwclock/hwclock.c:1321
+#: hwclock/hwclock.c:1459
msgid ""
"Sorry, only the superuser can change the Hardware Clock epoch in the "
"kernel.\n"
msgstr ""
"Beklager, kun superbrugeren kan ændre maskinurets epokeværdi i kernen.\n"
-#: hwclock/hwclock.c:1341
+#: hwclock/hwclock.c:1479
msgid "Cannot access the Hardware Clock via any known method.\n"
msgstr "Kan ikke tilgå maskinuret med nogen kendt metode.\n"
-#: hwclock/hwclock.c:1344
+#: hwclock/hwclock.c:1483
msgid ""
"Use the --debug option to see the details of our search for an access "
"method.\n"
@@ -5386,96 +5617,91 @@ msgstr ""
"Benyt tilvalget --debug for at se detaljerne fra vores søgning efter en "
"tilgangsmetode.\n"
-#: hwclock/kd.c:42
+#: hwclock/kd.c:43
msgid "Waiting in loop for time from KDGHWCLK to change\n"
msgstr "Venter i en løkke for at tiden fra KDGHWCLK ændres\n"
-#: hwclock/kd.c:45
+#: hwclock/kd.c:46
msgid "KDGHWCLK ioctl to read time failed"
msgstr "KDGHWCLK ioctl for at aflæse tiden mislykkedes"
-#: hwclock/kd.c:66 hwclock/rtc.c:174
+#: hwclock/kd.c:67 hwclock/rtc.c:187
msgid "Timed out waiting for time change.\n"
msgstr "Tidsudløb mens der ventedes på tidsændring.\n"
-#: hwclock/kd.c:70
+#: hwclock/kd.c:71
msgid "KDGHWCLK ioctl to read time failed in loop"
msgstr "KDGHWCLK ioctl for at aflæse tiden mislykkedes i løkke"
-#: hwclock/kd.c:92
+#: hwclock/kd.c:93
#, c-format
msgid "ioctl() failed to read time from %s"
msgstr "ioctl() kunne ikke aflæse tiden fra %s"
-#: hwclock/kd.c:128
+#: hwclock/kd.c:129
msgid "ioctl KDSHWCLK failed"
msgstr "KDGHWCLK-ioctl mislykkedes"
-#: hwclock/kd.c:165
+#: hwclock/kd.c:166
msgid "Can't open /dev/tty1 or /dev/vc/1"
msgstr "Kunne ikke åbne /dev/tty1 eller /dev/vc/1"
-#: hwclock/kd.c:170
+#: hwclock/kd.c:171
msgid "KDGHWCLK ioctl failed"
msgstr "KDGHWCLK ioctl mislykkedes"
-#: hwclock/rtc.c:136
+#: hwclock/rtc.c:115 hwclock/rtc.c:208
+#, c-format
+msgid "open() of %s failed"
+msgstr "open() af %s mislykkedes"
+
+#: hwclock/rtc.c:149
#, c-format
msgid "ioctl() to %s to read the time failed.\n"
msgstr "ioctl() til %s for at aflæse tiden mislykkedes.\n"
-#: hwclock/rtc.c:158
+#: hwclock/rtc.c:171
#, c-format
msgid "Waiting in loop for time from %s to change\n"
msgstr "Venter i løkke på at tiden fra %s ændres\n"
-#: hwclock/rtc.c:195 hwclock/rtc.c:250
-#, c-format
-msgid "open() of %s failed"
-msgstr "open() af %s mislykkedes"
-
-#: hwclock/rtc.c:213
+#: hwclock/rtc.c:226
#, c-format
msgid "%s does not have interrupt functions. "
msgstr "%s har ingen interrupt-funktioner. "
-#: hwclock/rtc.c:222
+#: hwclock/rtc.c:235
#, c-format
msgid "read() to %s to wait for clock tick failed"
msgstr "read() af %s for at vente på en ur-tik mislykkedes"
-#: hwclock/rtc.c:231
+#: hwclock/rtc.c:244
#, c-format
msgid "ioctl() to %s to turn off update interrupts failed"
msgstr "ioctl() til %s for at afbryde opdaterings-interrupts mislykkedes"
-#: hwclock/rtc.c:234
+#: hwclock/rtc.c:247
#, c-format
msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
msgstr ""
"ioctl() til %s for at afbryde opdaterings-interrupts mislykkedes uventet"
-#: hwclock/rtc.c:274 hwclock/rtc.c:358 hwclock/rtc.c:404
-#, c-format
-msgid "Unable to open %s"
-msgstr "Kunne ikke åbne %s"
-
-#: hwclock/rtc.c:300
+#: hwclock/rtc.c:306
#, c-format
msgid "ioctl() to %s to set the time failed.\n"
msgstr "ioctl() til %s for at sætte tiden mislykkedes.\n"
-#: hwclock/rtc.c:306
+#: hwclock/rtc.c:312
#, c-format
msgid "ioctl(%s) was successful.\n"
msgstr "ioctl(%s) lykkedes.\n"
-#: hwclock/rtc.c:335
+#: hwclock/rtc.c:341
#, c-format
msgid "Open of %s failed"
msgstr "Åbning af %s mislykkedes"
-#: hwclock/rtc.c:353 hwclock/rtc.c:399
+#: hwclock/rtc.c:359 hwclock/rtc.c:405
#, c-format
msgid ""
"To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
@@ -5486,12 +5712,17 @@ msgstr ""
"maskinursenhed via enhedsspecialfilen '%s'. Denne fil eksisterer ikke på "
"dette system.\n"
-#: hwclock/rtc.c:365
+#: hwclock/rtc.c:364 hwclock/rtc.c:410
+#, c-format
+msgid "Unable to open %s"
+msgstr "Kunne ikke åbne %s"
+
+#: hwclock/rtc.c:371
#, c-format
msgid "ioctl(RTC_EPOCH_READ) to %s failed"
msgstr "ioctl(RTC_EPOCH_READ) til %s mislykkedes"
-#: hwclock/rtc.c:371
+#: hwclock/rtc.c:377
#, c-format
msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
msgstr "vi har aflæst epokeværdi %ld fra %s med RTC_EPOCH_READ ioctl.\n"
@@ -5499,57 +5730,27 @@ msgstr "vi har aflæst epokeværdi %ld fra %s med RTC_EPOCH_READ ioctl.\n"
#. kernel would not accept this epoch value
#. Hmm - bad habit, deciding not to do what the user asks
#. just because one believes that the kernel might not like it.
-#: hwclock/rtc.c:391
+#: hwclock/rtc.c:397
#, c-format
msgid "The epoch value may not be less than 1900. You requested %ld\n"
msgstr "Epokeværdien må ikke være mindre end 1900. Du bad om %ld\n"
-#: hwclock/rtc.c:409
+#: hwclock/rtc.c:415
#, c-format
msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
msgstr "sætter epokeværdien til %ld med en RTC_EPOCH_SET ioctl til %s.\n"
-#: hwclock/rtc.c:414
+#: hwclock/rtc.c:420
#, c-format
msgid ""
"The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
msgstr "Kernens enheds-driver for %s har ikke en RTC_EPOCH_SET ioctl.\n"
-#: hwclock/rtc.c:417
+#: hwclock/rtc.c:423
#, c-format
msgid "ioctl(RTC_EPOCH_SET) to %s failed"
msgstr "ioctl(RTC_EPOCH_SET) til %s mislykkedes"
-#: hwclock/shhopt.c:255 hwclock/shhopt.c:281
-#, c-format
-msgid "invalid number `%s'\n"
-msgstr "Ugyldigt tal '%s'\n"
-
-#: hwclock/shhopt.c:258 hwclock/shhopt.c:284
-#, c-format
-msgid "number `%s' to `%s' out of range\n"
-msgstr "tallet '%s' til '%s' er ikke i det gyldige område\n"
-
-#: hwclock/shhopt.c:398
-#, c-format
-msgid "unrecognized option `%s'\n"
-msgstr "ukendt tilvalg '%s'\n"
-
-#: hwclock/shhopt.c:411 hwclock/shhopt.c:449
-#, c-format
-msgid "option `%s' requires an argument\n"
-msgstr "tilvalget '%s' kræver en parameter\n"
-
-#: hwclock/shhopt.c:417
-#, c-format
-msgid "option `%s' doesn't allow an argument\n"
-msgstr "tilvalget '%s' tillader ikke en parameter\n"
-
-#: hwclock/shhopt.c:439
-#, c-format
-msgid "unrecognized option `-%c'\n"
-msgstr "ukendt tilvalg '-%c'\n"
-
#: login-utils/agetty.c:312
msgid "calling open_tty\n"
msgstr "kalder 'open_tty'\n"
@@ -6579,7 +6780,7 @@ msgstr "kunne ikke åbne katalog\n"
msgid "fork failed\n"
msgstr "forgrening mislykkedes\n"
-#: login-utils/simpleinit.c:512 text-utils/more.c:1705
+#: login-utils/simpleinit.c:512 text-utils/more.c:1706
msgid "exec failed\n"
msgstr "programkørsel mislykkedes\n"
@@ -7363,159 +7564,159 @@ msgstr "[mntent]: linje %d i %s er ugyldig%s\n"
msgid "; rest of file ignored"
msgstr "; resten af filen blev ignoreret"
-#: mount/mount.c:379
+#: mount/mount.c:381
#, c-format
msgid "mount: according to mtab, %s is already mounted on %s"
msgstr "mount: ifølge mtab er %s allerede monteret som %s"
-#: mount/mount.c:383
+#: mount/mount.c:385
#, c-format
msgid "mount: according to mtab, %s is mounted on %s"
msgstr "mount: ifølge mtab er %s monteret som %s"
-#: mount/mount.c:404
+#: mount/mount.c:406
#, c-format
msgid "mount: can't open %s for writing: %s"
msgstr "mount: kunne ikke åbne %s for skrivning: %s"
-#: mount/mount.c:419 mount/mount.c:638
+#: mount/mount.c:421 mount/mount.c:640
#, c-format
msgid "mount: error writing %s: %s"
msgstr "mount: fejl ved skrivning til %s: %s"
-#: mount/mount.c:426
+#: mount/mount.c:428
#, c-format
msgid "mount: error changing mode of %s: %s"
msgstr "mount: fejl ved ændring af filmodus for %s: %s"
-#: mount/mount.c:472
+#: mount/mount.c:474
#, c-format
msgid "%s looks like swapspace - not mounted"
msgstr "%s ligner et swap-område - ikke monteret"
-#: mount/mount.c:532
+#: mount/mount.c:534
msgid "mount failed"
msgstr "montering mislykkedes"
-#: mount/mount.c:534
+#: mount/mount.c:536
#, c-format
msgid "mount: only root can mount %s on %s"
msgstr "mount: kun root kan montere %s som %s"
-#: mount/mount.c:562
+#: mount/mount.c:564
msgid "mount: loop device specified twice"
msgstr "mount: loop-enheden angivet to gange"
-#: mount/mount.c:567
+#: mount/mount.c:569
msgid "mount: type specified twice"
msgstr "mount: type angivet to gange"
-#: mount/mount.c:579
+#: mount/mount.c:581
msgid "mount: skipping the setup of a loop device\n"
msgstr "mount: dropper opsætning af loop-enhed\n"
-#: mount/mount.c:588
+#: mount/mount.c:590
#, c-format
msgid "mount: going to use the loop device %s\n"
msgstr "mount: skal til at benytte loop-enheden %s\n"
-#: mount/mount.c:592
+#: mount/mount.c:594
msgid "mount: failed setting up loop device\n"
msgstr "mount: klargøring af loop-enhed mislykkedes\n"
-#: mount/mount.c:596
+#: mount/mount.c:598
msgid "mount: setup loop device successfully\n"
msgstr "mount: klargøringen af loop-enhed lykkedes\n"
-#: mount/mount.c:633
+#: mount/mount.c:635
#, c-format
msgid "mount: can't open %s: %s"
msgstr "mount: kunne ikke åbne %s: %s"
-#: mount/mount.c:656
+#: mount/mount.c:658
#, c-format
msgid "mount: cannot open %s for setting speed"
msgstr "mount: kunne ikke åbne %s for at sætte hastigheden"
-#: mount/mount.c:659
+#: mount/mount.c:661
#, c-format
msgid "mount: cannot set speed: %s"
msgstr "mount: kunne ikke sætte hastigheden: %s"
-#: mount/mount.c:720 mount/mount.c:1265
+#: mount/mount.c:722 mount/mount.c:1295
#, c-format
msgid "mount: cannot fork: %s"
msgstr "mount: kunne ikke forgrene: %s"
-#: mount/mount.c:800
+#: mount/mount.c:802
msgid "mount: this version was compiled without support for the type `nfs'"
msgstr "mount: denne version blev oversat uden understøttelse for 'nfs'-typen"
-#: mount/mount.c:839
+#: mount/mount.c:841
msgid "mount: failed with nfs mount version 4, trying 3..\n"
msgstr "mount: montering af nfs version 4 mislykkedes, prøver version 3..\n"
-#: mount/mount.c:850
+#: mount/mount.c:852
msgid ""
"mount: I could not determine the filesystem type, and none was specified"
msgstr "mount: Jeg kunne ikke bestemme filsystemtypen, og ingen var angivet"
-#: mount/mount.c:853
+#: mount/mount.c:855
msgid "mount: you must specify the filesystem type"
msgstr "mount: du skal angive filsystemtypen"
#. should not happen
-#: mount/mount.c:856
+#: mount/mount.c:858
msgid "mount: mount failed"
msgstr "mount: montering mislykkedes"
-#: mount/mount.c:862 mount/mount.c:897
+#: mount/mount.c:864 mount/mount.c:899
#, c-format
msgid "mount: mount point %s is not a directory"
msgstr "mount: monteringspunkt %s er ikke et katalog"
-#: mount/mount.c:864
+#: mount/mount.c:866
msgid "mount: permission denied"
msgstr "mount: adgang nægtet"
-#: mount/mount.c:866
+#: mount/mount.c:868
msgid "mount: must be superuser to use mount"
msgstr "mount: skal være superbruger for at bruge 'mount'"
#. heuristic: if /proc/version exists, then probably proc is mounted
#. proc mounted?
-#: mount/mount.c:870 mount/mount.c:874
+#: mount/mount.c:872 mount/mount.c:876
#, c-format
msgid "mount: %s is busy"
msgstr "mount: %s er optaget"
#. no
#. yes, don't mention it
-#: mount/mount.c:876
+#: mount/mount.c:878
msgid "mount: proc already mounted"
msgstr "mount: proc er allerede monteret"
-#: mount/mount.c:878
+#: mount/mount.c:880
#, c-format
msgid "mount: %s already mounted or %s busy"
msgstr "mount: enten er %s allerede monteret eller %s optaget"
-#: mount/mount.c:884
+#: mount/mount.c:886
#, c-format
msgid "mount: mount point %s does not exist"
msgstr "mount: monteringspunkt %s eksisterer ikke"
-#: mount/mount.c:886
+#: mount/mount.c:888
#, c-format
msgid "mount: mount point %s is a symbolic link to nowhere"
msgstr "mount: monteringspunkt %s er en symbolsk lænke ud i ingenting"
-#: mount/mount.c:889
+#: mount/mount.c:891
#, c-format
msgid "mount: special device %s does not exist"
msgstr "mount: specialenhed %s eksisterer ikke"
-#: mount/mount.c:899
+#: mount/mount.c:901
#, c-format
msgid ""
"mount: special device %s does not exist\n"
@@ -7524,12 +7725,12 @@ msgstr ""
"mount: specialenhed %s eksisterer ikke\n"
" (en sti er ikke et katalog)\n"
-#: mount/mount.c:912
+#: mount/mount.c:914
#, c-format
msgid "mount: %s not mounted already, or bad option"
msgstr "mount: %s ikke allerede monteret, eller forkert tilvalg"
-#: mount/mount.c:914
+#: mount/mount.c:916
#, c-format
msgid ""
"mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -7538,47 +7739,47 @@ msgstr ""
"mount: forkert filsystemtype, forkert tilvalg, ugyldig superblok på %s,\n"
" eller for mange monterede filsystemer"
-#: mount/mount.c:948
+#: mount/mount.c:950
msgid "mount table full"
msgstr "monteringstabellen er fuld"
-#: mount/mount.c:950
+#: mount/mount.c:952
#, c-format
msgid "mount: %s: can't read superblock"
msgstr "mount: %s: kunne ikke læse superblokken"
-#: mount/mount.c:954
+#: mount/mount.c:956
#, c-format
msgid "mount: %s: unknown device"
msgstr "mount: %s: ukendt enhed"
-#: mount/mount.c:959
+#: mount/mount.c:961
#, c-format
msgid "mount: fs type %s not supported by kernel"
msgstr "mount: filsystemtype %s understøttes ikke af kernen"
-#: mount/mount.c:971
+#: mount/mount.c:973
#, c-format
msgid "mount: probably you meant %s"
msgstr "mount: du mente sikkert %s"
-#: mount/mount.c:973
+#: mount/mount.c:975
msgid "mount: maybe you meant iso9660 ?"
msgstr "mount: du mente måske iso9660 ?"
-#: mount/mount.c:976
+#: mount/mount.c:978
#, c-format
msgid "mount: %s has wrong device number or fs type %s not supported"
msgstr ""
"mount: %s har forkert enhedsnummer eller filsystemtypen %s understøttes ikke"
#. strange ...
-#: mount/mount.c:982
+#: mount/mount.c:984
#, c-format
msgid "mount: %s is not a block device, and stat fails?"
msgstr "mount: %s er ikke en blokenhed, og 'stat' fejler?"
-#: mount/mount.c:984
+#: mount/mount.c:986
#, c-format
msgid ""
"mount: the kernel does not recognize %s as a block device\n"
@@ -7587,92 +7788,97 @@ msgstr ""
"mount: kernen genkender ikke %s som en blokenhed\n"
" (måske hjælper 'insmod enheds-driver'?)"
-#: mount/mount.c:987
+#: mount/mount.c:989
#, c-format
msgid "mount: %s is not a block device (maybe try `-o loop'?)"
msgstr "mount: %s er ikke en blokenhed (brug eventuelt '-o loop'?)"
-#: mount/mount.c:990
+#: mount/mount.c:992
#, c-format
msgid "mount: %s is not a block device"
msgstr "mount: %s er ikke en blokenhed"
-#: mount/mount.c:993
+#: mount/mount.c:995
#, c-format
msgid "mount: %s is not a valid block device"
msgstr "mount: %s er ikke en gyldig blokenhed"
#. pre-linux 1.1.38, 1.1.41 and later
#. linux 1.1.38 and later
-#: mount/mount.c:996
+#: mount/mount.c:998
msgid "block device "
msgstr "blokenhed "
-#: mount/mount.c:998
+#: mount/mount.c:1000
#, c-format
msgid "mount: cannot mount %s%s read-only"
msgstr "mount: kunne ikke montere %s%s skrivebeskyttet"
-#: mount/mount.c:1002
+#: mount/mount.c:1004
#, c-format
msgid "mount: %s%s is write-protected but explicit `-w' flag given"
msgstr "mount: %s%s er skrivebeskyttet, men eksplicit '-w'-tilvalg blev givet"
-#: mount/mount.c:1018
+#: mount/mount.c:1020
#, c-format
msgid "mount: %s%s is write-protected, mounting read-only"
msgstr "mount: %s%s er skrivebeskyttet, monterer skrivebeskyttet"
-#: mount/mount.c:1104
+#: mount/mount.c:1107
#, c-format
msgid "mount: the label %s occurs on both %s and %s\n"
msgstr ""
-#: mount/mount.c:1108
+#: mount/mount.c:1111
#, fuzzy, c-format
msgid "mount: %s duplicate - not mounted"
msgstr "umount: %s: ikke monteret"
-#: mount/mount.c:1118
+#: mount/mount.c:1121
#, c-format
msgid "mount: going to mount %s by %s\n"
msgstr "mount: vil montere %s som %s\n"
-#: mount/mount.c:1119
+#: mount/mount.c:1122
msgid "UUID"
msgstr "UUID"
-#: mount/mount.c:1119
+#: mount/mount.c:1122
msgid "label"
msgstr "mærke"
-#: mount/mount.c:1121 mount/mount.c:1521
+#: mount/mount.c:1124 mount/mount.c:1555
msgid "mount: no such partition found"
msgstr "mount: fandt ingen sådan partition"
-#: mount/mount.c:1129
+#: mount/mount.c:1132
msgid "mount: no type was given - I'll assume nfs because of the colon\n"
msgstr "mount: ingen type blev angive - Jeg antager nfs på grund af kolonnet\n"
+#: mount/mount.c:1137
+#, fuzzy
+msgid "mount: no type was given - I'll assume smb because of the // prefix\n"
+msgstr "mount: ingen type blev angive - Jeg antager nfs på grund af kolonnet\n"
+
#.
#. * Retry in the background.
#.
-#: mount/mount.c:1145
+#: mount/mount.c:1153
#, c-format
msgid "mount: backgrounding \"%s\"\n"
msgstr "mount: kører \"%s\" i baggrunden\n"
-#: mount/mount.c:1156
+#: mount/mount.c:1164
#, c-format
msgid "mount: giving up \"%s\"\n"
msgstr "mount: opgiver \"%s\"\n"
-#: mount/mount.c:1216
+#: mount/mount.c:1240
#, c-format
msgid "mount: %s already mounted on %s\n"
msgstr "mount: %s er allerede monteret som %s\n"
-#: mount/mount.c:1335
+#: mount/mount.c:1369
msgid ""
"Usage: mount -V : print version\n"
" mount -h : print this help\n"
@@ -7718,40 +7924,40 @@ msgstr ""
"Andre tilvalg: [-nfFrsvw] [-o tilvalg].\n"
"Læs mange flere detaljer med 'man 8 mount'.\n"
-#: mount/mount.c:1497
+#: mount/mount.c:1531
msgid "mount: only root can do that"
msgstr "mount: dette kan kun root gøre"
-#: mount/mount.c:1502
+#: mount/mount.c:1536
#, c-format
msgid "mount: no %s found - creating it..\n"
msgstr "mount: ingen %s fundet - opretter den..\n"
-#: mount/mount.c:1516
+#: mount/mount.c:1550
#, c-format
msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
msgstr ""
-#: mount/mount.c:1523
+#: mount/mount.c:1557
#, c-format
msgid "mount: mounting %s\n"
msgstr "mount: monterer %s\n"
-#: mount/mount.c:1532
+#: mount/mount.c:1566
msgid "nothing was mounted"
msgstr "intet blev monteret"
-#: mount/mount.c:1547
+#: mount/mount.c:1581
#, c-format
msgid "mount: cannot find %s in %s"
msgstr "mount: kunne ikke finde %s i %s"
-#: mount/mount.c:1562
+#: mount/mount.c:1596
#, c-format
msgid "mount: can't find %s in %s or %s"
msgstr "mount: kunne ikke finde %s i %s eller %s"
-#: mount/mount_by_label.c:169
+#: mount/mount_by_label.c:199
#, c-format
msgid ""
"mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
@@ -7759,34 +7965,34 @@ msgstr ""
"mount: kunne ikke åbne %s, så UUID- og MÆRKE­konvertering kan ikke "
"gennemføres.\n"
-#: mount/mount_by_label.c:295
+#: mount/mount_by_label.c:325
msgid "mount: bad UUID"
msgstr "mount: ugyldig UUID"
-#: mount/mount_guess_fstype.c:487
+#: mount/mount_guess_fstype.c:482
msgid "mount: error while guessing filesystem type\n"
msgstr "mount: fejl ved gæt af filsystemtype\n"
-#: mount/mount_guess_fstype.c:496
+#: mount/mount_guess_fstype.c:491
#, c-format
msgid "mount: you didn't specify a filesystem type for %s\n"
msgstr "mount: du angav ikke filsystemtype for %s\n"
-#: mount/mount_guess_fstype.c:499
+#: mount/mount_guess_fstype.c:494
#, c-format
msgid " I will try all types mentioned in %s or %s\n"
msgstr " Jeg vil forsøge alle typerne, der nævnes i %s eller %s\n"
-#: mount/mount_guess_fstype.c:502
+#: mount/mount_guess_fstype.c:497
msgid " and it looks like this is swapspace\n"
msgstr " og det ser ud til, at dette er swapområde\n"
-#: mount/mount_guess_fstype.c:504
+#: mount/mount_guess_fstype.c:499
#, c-format
msgid " I will try type %s\n"
msgstr " Jeg vil forsøge type %s\n"
-#: mount/mount_guess_fstype.c:592
+#: mount/mount_guess_fstype.c:587
#, c-format
msgid "Trying %s\n"
msgstr "Forsøger %s\n"
@@ -7880,7 +8086,7 @@ msgstr "ukendt NFS-statusværdi: %d"
msgid "bug in xstrndup call"
msgstr "programfejl i xstrndup-kald"
-#: mount/swapon.c:51
+#: mount/swapon.c:56
#, c-format
msgid ""
"usage: %s [-hV]\n"
@@ -7893,27 +8099,43 @@ msgstr ""
" %s [-v] [-p prioritet] speciel ...\n"
" %s [-s]\n"
-#: mount/swapon.c:88
+#: mount/swapon.c:66
+#, fuzzy, c-format
+msgid ""
+"usage: %s [-hV]\n"
+" %s -a [-v]\n"
+" %s [-v] special ...\n"
+msgstr ""
+"brug: %s [-hV]\n"
+" %s -a [-v]\n"
+" %s [-v] [-p prioritet] speciel ...\n"
+" %s [-s]\n"
+
+#: mount/swapon.c:170 mount/swapon.c:234
#, c-format
msgid "%s on %s\n"
msgstr "%s på %s\n"
-#: mount/swapon.c:93
+#: mount/swapon.c:174
#, c-format
msgid "swapon: cannot stat %s: %s\n"
msgstr "swapon: kan ikke finde %s: %s\n"
-#: mount/swapon.c:105
+#: mount/swapon.c:185
#, c-format
msgid "swapon: warning: %s has insecure permissions %04o, %04o suggested\n"
msgstr "swapon: advarsel: %s har usikre filrettigheder %04o, %04o anbefales\n"
-#: mount/swapon.c:115
+#: mount/swapon.c:197
#, c-format
msgid "swapon: Skipping file %s - it appears to have holes.\n"
msgstr "swapon: Dropper filen %s - den lader til at være fragmenteret.\n"
-#: mount/swapon.c:222
+#: mount/swapon.c:240
+msgid "Not superuser.\n"
+msgstr ""
+
+#: mount/swapon.c:298 mount/swapon.c:386
#, c-format
msgid "%s: cannot open %s: %s\n"
msgstr "%s: kunne ikke åbne %s: %s\n"
@@ -8283,28 +8505,28 @@ msgstr "%s på %s\n"
msgid "%s: unknown argument: %s\n"
msgstr "%s: ukendt signal %s\n"
-#: sys-utils/ipcs.c:122
+#: sys-utils/ipcs.c:121
#, c-format
msgid "usage : %s -asmq -tclup \n"
msgstr "brug : %s -asmq -tclup \n"
-#: sys-utils/ipcs.c:123
+#: sys-utils/ipcs.c:122
#, c-format
msgid "\t%s [-s -m -q] -i id\n"
msgstr "\t%s [-s -m -q] -i id\n"
-#: sys-utils/ipcs.c:124
+#: sys-utils/ipcs.c:123
#, c-format
msgid "\t%s -h for help.\n"
msgstr "\t%s -h for hjælp.\n"
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:129
#, c-format
msgid ""
"%s provides information on ipc facilities for which you have read access.\n"
msgstr "%s viser oplysninger om de ipc-faciliteter, du har læseadgang til.\n"
-#: sys-utils/ipcs.c:132
+#: sys-utils/ipcs.c:131
msgid ""
"Resource Specification:\n"
"\t-m : shared_mem\n"
@@ -8314,7 +8536,7 @@ msgstr ""
"\t-m : delt_hukommelse\n"
"\t-q : beskeder\n"
-#: sys-utils/ipcs.c:133
+#: sys-utils/ipcs.c:132
msgid ""
"\t-s : semaphores\n"
"\t-a : all (default)\n"
@@ -8322,7 +8544,7 @@ msgstr ""
"\t-s : semaforer\n"
"\t-a : alle (standard)\n"
-#: sys-utils/ipcs.c:134
+#: sys-utils/ipcs.c:133
msgid ""
"Output Format:\n"
"\t-t : time\n"
@@ -8334,7 +8556,7 @@ msgstr ""
"\t-p : pid\n"
"\t-c : skaber\n"
-#: sys-utils/ipcs.c:135
+#: sys-utils/ipcs.c:134
msgid ""
"\t-l : limits\n"
"\t-u : summary\n"
@@ -8342,376 +8564,376 @@ msgstr ""
"\t-l : grænser\n"
"\t-u : sammendrag\n"
-#: sys-utils/ipcs.c:136
+#: sys-utils/ipcs.c:135
msgid "-i id [-s -q -m] : details on resource identified by id\n"
msgstr "-i id [-s -q -m] : detaljer om ressourcen angivet ved id\n"
-#: sys-utils/ipcs.c:268
+#: sys-utils/ipcs.c:267
msgid "kernel not configured for shared memory\n"
msgstr "kernen er ikke konfigureret til brug af delt hukommelse\n"
-#: sys-utils/ipcs.c:274
+#: sys-utils/ipcs.c:273
msgid "------ Shared Memory Limits --------\n"
msgstr "---- Grænser for delt hukommelse ---\n"
#. glibc 2.1.3 and all earlier libc's have ints as fields
#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
-#: sys-utils/ipcs.c:279
+#: sys-utils/ipcs.c:278
#, c-format
msgid "max number of segments = %ld\n"
msgstr "maks antal segmenter= %ld\n"
-#: sys-utils/ipcs.c:281
+#: sys-utils/ipcs.c:280
#, c-format
msgid "max seg size (kbytes) = %ld\n"
msgstr "maks seg-stør. (kbyte) = %ld\n"
-#: sys-utils/ipcs.c:283
+#: sys-utils/ipcs.c:282
#, c-format
msgid "max total shared memory (kbytes) = %ld\n"
msgstr "maks total delt hukommelse (kbyte) = %ld\n"
-#: sys-utils/ipcs.c:285
+#: sys-utils/ipcs.c:284
#, c-format
msgid "min seg size (bytes) = %ld\n"
msgstr "min seg-stør. (byte) = %ld\n"
-#: sys-utils/ipcs.c:290
+#: sys-utils/ipcs.c:289
msgid "------ Shared Memory Status --------\n"
msgstr "---- Status for delt hukommelse ----\n"
-#: sys-utils/ipcs.c:291
+#: sys-utils/ipcs.c:290
#, c-format
msgid "segments allocated %d\n"
msgstr "allokerede segmenter %d\n"
-#: sys-utils/ipcs.c:292
+#: sys-utils/ipcs.c:291
#, c-format
msgid "pages allocated %ld\n"
msgstr "allokerede sider %ld\n"
-#: sys-utils/ipcs.c:293
+#: sys-utils/ipcs.c:292
#, c-format
msgid "pages resident %ld\n"
msgstr "sider i ram %ld\n"
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:293
#, c-format
msgid "pages swapped %ld\n"
msgstr "sider i swap'et %ld\n"
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:294
#, c-format
msgid "Swap performance: %ld attempts\t %ld successes\n"
msgstr "Swap præstation: %ld forsøg\t %ld successer\n"
-#: sys-utils/ipcs.c:300
+#: sys-utils/ipcs.c:299
msgid "------ Shared Memory Segment Creators/Owners --------\n"
msgstr "---- Delte hukommelsessegmenters skabere/ejere ------\n"
-#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:300 sys-utils/ipcs.c:417 sys-utils/ipcs.c:516
#, c-format
msgid "%-10s %-10s %-10s %-10s %-10s %-10s\n"
msgstr "%-10s %-10s %-10s %-10s %-10s %-10s\n"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:308 sys-utils/ipcs.c:315
-#: sys-utils/ipcs.c:321 sys-utils/ipcs.c:425
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:307 sys-utils/ipcs.c:314
+#: sys-utils/ipcs.c:320 sys-utils/ipcs.c:424
msgid "shmid"
msgstr "dthid"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:321 sys-utils/ipcs.c:419
-#: sys-utils/ipcs.c:434 sys-utils/ipcs.c:519 sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:320 sys-utils/ipcs.c:418
+#: sys-utils/ipcs.c:433 sys-utils/ipcs.c:517 sys-utils/ipcs.c:535
msgid "perms"
msgstr "rtghd"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:517
msgid "cuid"
msgstr "cuid"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:517
msgid "cgid"
msgstr "cgid"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:517
msgid "uid"
msgstr "uid"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:517
msgid "gid"
msgstr "gid"
-#: sys-utils/ipcs.c:306
+#: sys-utils/ipcs.c:305
msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
msgstr "--- Delt hukommelse Til-/afkoblings-/ændringstider -----\n"
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:306
#, c-format
msgid "%-10s %-10s %-20s %-20s %-20s\n"
msgstr "%-10s %-10s %-20s %-20s %-20s\n"
-#: sys-utils/ipcs.c:308 sys-utils/ipcs.c:315 sys-utils/ipcs.c:321
-#: sys-utils/ipcs.c:425 sys-utils/ipcs.c:434 sys-utils/ipcs.c:525
-#: sys-utils/ipcs.c:531 sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:314 sys-utils/ipcs.c:320
+#: sys-utils/ipcs.c:424 sys-utils/ipcs.c:433 sys-utils/ipcs.c:523
+#: sys-utils/ipcs.c:529 sys-utils/ipcs.c:535
msgid "owner"
msgstr "ejer"
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:307
msgid "attached"
msgstr "tilkoblet"
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:307
msgid "detached"
msgstr "afkoblet"
-#: sys-utils/ipcs.c:309
+#: sys-utils/ipcs.c:308
msgid "changed"
msgstr "ændret"
-#: sys-utils/ipcs.c:313
+#: sys-utils/ipcs.c:312
msgid "------ Shared Memory Creator/Last-op --------\n"
msgstr "----- Delt hukommelse skaber/Sidste-op ------\n"
-#: sys-utils/ipcs.c:314 sys-utils/ipcs.c:530
+#: sys-utils/ipcs.c:313 sys-utils/ipcs.c:528
#, c-format
msgid "%-10s %-10s %-10s %-10s\n"
msgstr "%-10s %-10s %-10s %-10s\n"
-#: sys-utils/ipcs.c:315
+#: sys-utils/ipcs.c:314
msgid "cpid"
msgstr "cpid"
-#: sys-utils/ipcs.c:315
+#: sys-utils/ipcs.c:314
msgid "lpid"
msgstr "lpid"
-#: sys-utils/ipcs.c:319
+#: sys-utils/ipcs.c:318
msgid "------ Shared Memory Segments --------\n"
msgstr "----- Delte hukommelsessegmenter -----\n"
-#: sys-utils/ipcs.c:320
+#: sys-utils/ipcs.c:319
#, c-format
msgid "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n"
msgstr "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n"
-#: sys-utils/ipcs.c:321 sys-utils/ipcs.c:434 sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:320 sys-utils/ipcs.c:433 sys-utils/ipcs.c:535
msgid "key"
msgstr "nøgle"
-#: sys-utils/ipcs.c:321
+#: sys-utils/ipcs.c:320
msgid "bytes"
msgstr "byte"
-#: sys-utils/ipcs.c:322
+#: sys-utils/ipcs.c:321
msgid "nattch"
msgstr "atlkbl"
-#: sys-utils/ipcs.c:322 sys-utils/ipcs.c:435
+#: sys-utils/ipcs.c:321
msgid "status"
msgstr "status"
-#: sys-utils/ipcs.c:343 sys-utils/ipcs.c:345 sys-utils/ipcs.c:347
-#: sys-utils/ipcs.c:456 sys-utils/ipcs.c:458 sys-utils/ipcs.c:558
-#: sys-utils/ipcs.c:560 sys-utils/ipcs.c:562 sys-utils/ipcs.c:615
-#: sys-utils/ipcs.c:617 sys-utils/ipcs.c:646 sys-utils/ipcs.c:648
-#: sys-utils/ipcs.c:650 sys-utils/ipcs.c:674
+#: sys-utils/ipcs.c:342 sys-utils/ipcs.c:344 sys-utils/ipcs.c:346
+#: sys-utils/ipcs.c:455 sys-utils/ipcs.c:457 sys-utils/ipcs.c:556
+#: sys-utils/ipcs.c:558 sys-utils/ipcs.c:560 sys-utils/ipcs.c:613
+#: sys-utils/ipcs.c:615 sys-utils/ipcs.c:644 sys-utils/ipcs.c:646
+#: sys-utils/ipcs.c:648 sys-utils/ipcs.c:672
msgid "Not set"
msgstr "Ikke sat"
-#: sys-utils/ipcs.c:372
+#: sys-utils/ipcs.c:371
msgid "dest"
msgstr "mål"
-#: sys-utils/ipcs.c:373
+#: sys-utils/ipcs.c:372
msgid "locked"
msgstr "låst"
-#: sys-utils/ipcs.c:393
+#: sys-utils/ipcs.c:392
msgid "kernel not configured for semaphores\n"
msgstr "kernen ikke konfigureret til semaforer\n"
-#: sys-utils/ipcs.c:399
+#: sys-utils/ipcs.c:398
msgid "------ Semaphore Limits --------\n"
msgstr "-------- Semaforgrænser -------\n"
-#: sys-utils/ipcs.c:403
+#: sys-utils/ipcs.c:402
#, c-format
msgid "max number of arrays = %d\n"
msgstr "maks antal tabeller = %d\n"
-#: sys-utils/ipcs.c:404
+#: sys-utils/ipcs.c:403
#, c-format
msgid "max semaphores per array = %d\n"
msgstr "maks semaforer per tabel = %d\n"
-#: sys-utils/ipcs.c:405
+#: sys-utils/ipcs.c:404
#, c-format
msgid "max semaphores system wide = %d\n"
msgstr "maks semaforer i hele systemet = %d\n"
-#: sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:405
#, c-format
msgid "max ops per semop call = %d\n"
msgstr "maks ops per semop-kald = %d\n"
-#: sys-utils/ipcs.c:407
+#: sys-utils/ipcs.c:406
#, c-format
msgid "semaphore max value = %d\n"
msgstr "semafor maksværdi = %d\n"
-#: sys-utils/ipcs.c:411
+#: sys-utils/ipcs.c:410
msgid "------ Semaphore Status --------\n"
msgstr "-------- Semaforstatus --------\n"
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:411
#, c-format
msgid "used arrays = %d\n"
msgstr "brugte tabeller = %d\n"
-#: sys-utils/ipcs.c:413
+#: sys-utils/ipcs.c:412
#, c-format
msgid "allocated semaphores = %d\n"
msgstr "allokerede semaforer = %d\n"
-#: sys-utils/ipcs.c:417
+#: sys-utils/ipcs.c:416
msgid "------ Semaphore Arrays Creators/Owners --------\n"
msgstr "------- Semafortabellers skabere/ejere ---------\n"
-#: sys-utils/ipcs.c:419 sys-utils/ipcs.c:434
+#: sys-utils/ipcs.c:418 sys-utils/ipcs.c:433
msgid "semid"
msgstr "semid"
-#: sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:422
msgid "------ Shared Memory Operation/Change Times --------\n"
msgstr "---- Delt hukommelse operations-/ændringstider -----\n"
-#: sys-utils/ipcs.c:424
+#: sys-utils/ipcs.c:423
#, c-format
msgid "%-8s %-10s %-26.24s %-26.24s\n"
msgstr "%-8s %-10s %-26.24s %-26.24s\n"
-#: sys-utils/ipcs.c:425
+#: sys-utils/ipcs.c:424
msgid "last-op"
msgstr "sidstop"
-#: sys-utils/ipcs.c:425
+#: sys-utils/ipcs.c:424
msgid "last-changed"
msgstr "sidst-ændret"
-#: sys-utils/ipcs.c:432
+#: sys-utils/ipcs.c:431
msgid "------ Semaphore Arrays --------\n"
msgstr "-------- Semafortabeller --------\n"
-#: sys-utils/ipcs.c:433
+#: sys-utils/ipcs.c:432 sys-utils/ipcs.c:675
#, c-format
-msgid "%-10s %-10s %-10s %-10s %-10s %-12s\n"
-msgstr "%-10s %-10s %-10s %-10s %-10s %-12s\n"
+msgid "%-10s %-10s %-10s %-10s %-10s\n"
+msgstr "%-10s %-10s %-10s %-10s %-10s\n"
-#: sys-utils/ipcs.c:435
+#: sys-utils/ipcs.c:434
msgid "nsems"
msgstr "nsemf"
-#: sys-utils/ipcs.c:495
+#: sys-utils/ipcs.c:493
msgid "kernel not configured for message queues\n"
msgstr "kernen er ikke konfigureret til beskedkøer\n"
-#: sys-utils/ipcs.c:503
+#: sys-utils/ipcs.c:501
msgid "------ Messages: Limits --------\n"
msgstr "------ Beskeder: Grænser -------\n"
-#: sys-utils/ipcs.c:504
+#: sys-utils/ipcs.c:502
#, c-format
msgid "max queues system wide = %d\n"
msgstr "maks køer på systemet = %d\n"
-#: sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:503
#, c-format
msgid "max size of message (bytes) = %d\n"
msgstr "maks-størrelse af besked (byte) = %d\n"
-#: sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:504
#, c-format
msgid "default max size of queue (bytes) = %d\n"
msgstr "standard maks-størrelse af kø (byte) = %d\n"
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:508
msgid "------ Messages: Status --------\n"
msgstr "------ Beskeder: Status --------\n"
-#: sys-utils/ipcs.c:511
+#: sys-utils/ipcs.c:509
#, c-format
msgid "allocated queues = %d\n"
msgstr "allokerede køer= %d\n"
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:510
#, c-format
msgid "used headers = %d\n"
msgstr "brugte hoveder = %d\n"
-#: sys-utils/ipcs.c:513
+#: sys-utils/ipcs.c:511
#, c-format
msgid "used space = %d bytes\n"
msgstr "brugt plads = %d byte\n"
-#: sys-utils/ipcs.c:517
+#: sys-utils/ipcs.c:515
msgid "------ Message Queues: Creators/Owners --------\n"
msgstr "--------- Beskedkøer: skabere/ejere ----------\n"
-#: sys-utils/ipcs.c:519 sys-utils/ipcs.c:525 sys-utils/ipcs.c:531
-#: sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:517 sys-utils/ipcs.c:523 sys-utils/ipcs.c:529
+#: sys-utils/ipcs.c:535
msgid "msqid"
msgstr "bkøid"
-#: sys-utils/ipcs.c:523
+#: sys-utils/ipcs.c:521
msgid "------ Message Queues Send/Recv/Change Times --------\n"
msgstr "------ Beskedkøer send/modtag/ændrings-tider --------\n"
-#: sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:522
#, c-format
msgid "%-8s %-10s %-20s %-20s %-20s\n"
msgstr "%-8s %-10s %-20s %-20s %-20s\n"
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:523
msgid "send"
msgstr "send"
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:523
msgid "recv"
msgstr "modt"
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:523
msgid "change"
msgstr "ændrng"
-#: sys-utils/ipcs.c:529
+#: sys-utils/ipcs.c:527
msgid "------ Message Queues PIDs --------\n"
msgstr "------ Beskedkøers PIDer ---------\n"
-#: sys-utils/ipcs.c:531
+#: sys-utils/ipcs.c:529
msgid "lspid"
msgstr "lspid"
-#: sys-utils/ipcs.c:531
+#: sys-utils/ipcs.c:529
msgid "lrpid"
msgstr "lrpid"
-#: sys-utils/ipcs.c:535
+#: sys-utils/ipcs.c:533
msgid "------ Message Queues --------\n"
msgstr "-------- Beskedkøer ----------\n"
-#: sys-utils/ipcs.c:536
+#: sys-utils/ipcs.c:534
#, c-format
msgid "%-10s %-10s %-10s %-10s %-12s %-12s\n"
msgstr "%-10s %-10s %-10s %-10s %-12s %-12s\n"
-#: sys-utils/ipcs.c:538
+#: sys-utils/ipcs.c:536
msgid "used-bytes"
msgstr "brugte-byte"
-#: sys-utils/ipcs.c:538
+#: sys-utils/ipcs.c:536
msgid "messages"
msgstr "beskeder"
-#: sys-utils/ipcs.c:606
+#: sys-utils/ipcs.c:604
#, c-format
msgid ""
"\n"
@@ -8720,37 +8942,37 @@ msgstr ""
"\n"
"Delt hukommelsessegment dhsid=%d\n"
-#: sys-utils/ipcs.c:607
+#: sys-utils/ipcs.c:605
#, c-format
msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
-#: sys-utils/ipcs.c:609
+#: sys-utils/ipcs.c:607
#, c-format
msgid "mode=%#o\taccess_perms=%#o\n"
msgstr "modus=%#o\tadgangs_rett=%#o\n"
-#: sys-utils/ipcs.c:611
+#: sys-utils/ipcs.c:609
#, c-format
msgid "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n"
msgstr "byte=%d\tlpid=%d\tcpid=%d\tatilkbl=%ld\n"
-#: sys-utils/ipcs.c:614
+#: sys-utils/ipcs.c:612
#, c-format
msgid "att_time=%-26.24s\n"
msgstr "tilk_tid=%-26.24s\n"
-#: sys-utils/ipcs.c:616
+#: sys-utils/ipcs.c:614
#, c-format
msgid "det_time=%-26.24s\n"
msgstr "frak_tid=%-26.24s\n"
-#: sys-utils/ipcs.c:618 sys-utils/ipcs.c:649
+#: sys-utils/ipcs.c:616 sys-utils/ipcs.c:647
#, c-format
msgid "change_time=%-26.24s\n"
msgstr "ændrings_tid=%-26.24s\n"
-#: sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:631
#, c-format
msgid ""
"\n"
@@ -8759,27 +8981,27 @@ msgstr ""
"\n"
"Beskedkø bkøid=%d\n"
-#: sys-utils/ipcs.c:634
+#: sys-utils/ipcs.c:632
#, c-format
msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmodus=%#o\n"
-#: sys-utils/ipcs.c:636
+#: sys-utils/ipcs.c:634
#, c-format
msgid "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
msgstr "cbyte=%ld\tkøbyte=%ld\tkant=%ld\tlspid=%d\tlrpid=%d\n"
-#: sys-utils/ipcs.c:645
+#: sys-utils/ipcs.c:643
#, c-format
msgid "send_time=%-26.24s\n"
msgstr "send_tid=%-26.24s\n"
-#: sys-utils/ipcs.c:647
+#: sys-utils/ipcs.c:645
#, c-format
msgid "rcv_time=%-26.24s\n"
msgstr "modt_tid=%-26.24s\n"
-#: sys-utils/ipcs.c:667
+#: sys-utils/ipcs.c:665
#, c-format
msgid ""
"\n"
@@ -8788,53 +9010,48 @@ msgstr ""
"\n"
"Semafortabel semid=%d\n"
-#: sys-utils/ipcs.c:668
+#: sys-utils/ipcs.c:666
#, c-format
msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
msgstr "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
-#: sys-utils/ipcs.c:670
+#: sys-utils/ipcs.c:668
#, c-format
msgid "mode=%#o, access_perms=%#o\n"
msgstr "modus=%#o, adgangs_rett=%#o\n"
-#: sys-utils/ipcs.c:672
+#: sys-utils/ipcs.c:670
#, c-format
msgid "nsems = %ld\n"
msgstr "nsign = %ld\n"
-#: sys-utils/ipcs.c:673
+#: sys-utils/ipcs.c:671
#, c-format
msgid "otime = %-26.24s\n"
msgstr "otid = %-26.24s\n"
-#: sys-utils/ipcs.c:675
+#: sys-utils/ipcs.c:673
#, c-format
msgid "ctime = %-26.24s\n"
msgstr "ætid = %-26.24s\n"
-#: sys-utils/ipcs.c:677
-#, c-format
-msgid "%-10s %-10s %-10s %-10s %-10s\n"
-msgstr "%-10s %-10s %-10s %-10s %-10s\n"
-
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "semnum"
msgstr "sigant"
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "value"
msgstr "værdi"
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "ncount"
msgstr "nantal"
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "zcount"
msgstr "zantal"
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "pid"
msgstr "pid"
@@ -9084,11 +9301,11 @@ msgstr "-- linje allerede skrevet ud"
msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
msgstr "brug: %s [ - ] [ -2 ] [ fil ... ]\n"
-#: text-utils/column.c:298
+#: text-utils/column.c:297
msgid "line too long"
msgstr "for lang linje"
-#: text-utils/column.c:375
+#: text-utils/column.c:374
msgid "usage: column [-tx] [-c columns] [file ...]\n"
msgstr "brug: column [-tx] [-c søjler] [fil ...]\n"
@@ -9180,33 +9397,33 @@ msgstr ""
msgid "Can't open help file"
msgstr "Kunne ikke åbne hjælpefilen"
-#: text-utils/more.c:1442 text-utils/more.c:1446
+#: text-utils/more.c:1442 text-utils/more.c:1447
msgid "[Press 'h' for instructions.]"
msgstr "[Tryk 'h' for instruktioner.]"
-#: text-utils/more.c:1480
+#: text-utils/more.c:1481
#, c-format
msgid "\"%s\" line %d"
msgstr "\"%s\" linje %d"
-#: text-utils/more.c:1482
+#: text-utils/more.c:1483
#, c-format
msgid "[Not a file] line %d"
msgstr "[Ikke en fil] linje %d"
-#: text-utils/more.c:1566
+#: text-utils/more.c:1567
msgid " Overflow\n"
msgstr " Overløb\n"
-#: text-utils/more.c:1613
+#: text-utils/more.c:1614
msgid "...skipping\n"
msgstr "...overspringer\n"
-#: text-utils/more.c:1643
+#: text-utils/more.c:1644
msgid "Regular expression botch"
msgstr "Forkludret regulært udtryk"
-#: text-utils/more.c:1655
+#: text-utils/more.c:1656
msgid ""
"\n"
"Pattern not found\n"
@@ -9214,15 +9431,15 @@ msgstr ""
"\n"
"Mønster ikke fundet\n"
-#: text-utils/more.c:1658
+#: text-utils/more.c:1659 text-utils/pg.c:1134 text-utils/pg.c:1285
msgid "Pattern not found"
msgstr "Mønster ikke fundet"
-#: text-utils/more.c:1719
+#: text-utils/more.c:1720
msgid "can't fork\n"
msgstr "kunne ikke forgrene (fork)\n"
-#: text-utils/more.c:1758
+#: text-utils/more.c:1759
msgid ""
"\n"
"...Skipping "
@@ -9230,19 +9447,19 @@ msgstr ""
"\n"
"...Overspringer "
-#: text-utils/more.c:1763
+#: text-utils/more.c:1764
msgid "...Skipping to file "
msgstr "...Springer til filen "
-#: text-utils/more.c:1765
+#: text-utils/more.c:1766
msgid "...Skipping back to file "
msgstr "...Springer tilbage til filen "
-#: text-utils/more.c:2046
+#: text-utils/more.c:2047
msgid "Line too long"
msgstr "For lang linje"
-#: text-utils/more.c:2089
+#: text-utils/more.c:2090
msgid "No previous command to substitute for"
msgstr "Ingen tidligere kommando at erstatte med"
@@ -9292,6 +9509,102 @@ msgstr "hexdump: ugyldigt format {%s}\n"
msgid "hexdump: bad conversion character %%%s.\n"
msgstr "hexdump: ugyldig konverteringstegn %%%s.\n"
+#: text-utils/pg.c:246
+#, c-format
+msgid ""
+"%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
+msgstr ""
+
+#: text-utils/pg.c:255
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- %s\n"
+msgstr "tilvalget '%s' kræver en parameter\n"
+
+#: text-utils/pg.c:263
+#, fuzzy, c-format
+msgid "%s: illegal option -- %s\n"
+msgstr "Ugyldig tast"
+
+#: text-utils/pg.c:380
+#, fuzzy
+msgid "...skipping forward\n"
+msgstr "...overspringer\n"
+
+#: text-utils/pg.c:382
+#, fuzzy
+msgid "...skipping backward\n"
+msgstr "...overspringer\n"
+
+#: text-utils/pg.c:404
+#, fuzzy
+msgid "No next file"
+msgstr "(Næste fil: %s)"
+
+#: text-utils/pg.c:408
+#, fuzzy
+msgid "No previous file"
+msgstr "Ingen partitioner defineret\n"
+
+#: text-utils/pg.c:938
+#, fuzzy, c-format
+msgid "%s: Read error from %s file\n"
+msgstr "%s: læsefejl på %s\n"
+
+#.
+#. * Most likely '\0' in input.
+#.
+#: text-utils/pg.c:944
+#, c-format
+msgid "%s: Unexpected EOF in %s file\n"
+msgstr ""
+
+#: text-utils/pg.c:947
+#, fuzzy, c-format
+msgid "%s: Unknown error in %s file\n"
+msgstr "%s: søgefejl på %s\n"
+
+#: text-utils/pg.c:1042
+#, fuzzy, c-format
+msgid "%s: Cannot create tempfile\n"
+msgstr "%s: kunne ikke læse midlertidig fil.\n"
+
+#: text-utils/pg.c:1051 text-utils/pg.c:1226
+#, fuzzy
+msgid "RE error: "
+msgstr ", fejl"
+
+#: text-utils/pg.c:1208
+msgid "(EOF)"
+msgstr ""
+
+#: text-utils/pg.c:1234
+msgid "No remembered search string"
+msgstr ""
+
+#: text-utils/pg.c:1317
+#, fuzzy
+msgid "Cannot open "
+msgstr "Kunne ikke åbne %s\n"
+
+#: text-utils/pg.c:1365
+#, fuzzy
+msgid "saved"
+msgstr "send"
+
+#: text-utils/pg.c:1472
+msgid ": !command not allowed in rflag mode.\n"
+msgstr ""
+
+#: text-utils/pg.c:1504
+#, fuzzy
+msgid "fork() failed, try again later\n"
+msgstr "Adgangskode *IKKE* ændret. Prøv igen senere.\n"
+
+#: text-utils/pg.c:1709
+#, fuzzy
+msgid "(Next file: "
+msgstr "(Næste fil: %s)"
+
#: text-utils/rev.c:113
msgid "Unable to allocate bufferspace\n"
msgstr "Kunne ikke allokere bufferplads\n"
@@ -9325,3 +9638,24 @@ msgstr "For lang inddatalinje.\n"
#: text-utils/ul.c:599
msgid "Out of memory when growing buffer.\n"
msgstr "Løb tør for hukommelse under forstørring af buffer.\n"
+
+#~ msgid "invalid number `%s'\n"
+#~ msgstr "Ugyldigt tal '%s'\n"
+
+#~ msgid "number `%s' to `%s' out of range\n"
+#~ msgstr "tallet '%s' til '%s' er ikke i det gyldige område\n"
+
+#~ msgid "unrecognized option `%s'\n"
+#~ msgstr "ukendt tilvalg '%s'\n"
+
+#~ msgid "option `%s' requires an argument\n"
+#~ msgstr "tilvalget '%s' kræver en parameter\n"
+
+#~ msgid "option `%s' doesn't allow an argument\n"
+#~ msgstr "tilvalget '%s' tillader ikke en parameter\n"
+
+#~ msgid "unrecognized option `-%c'\n"
+#~ msgstr "ukendt tilvalg '-%c'\n"
+
+#~ msgid "%-10s %-10s %-10s %-10s %-10s %-12s\n"
+#~ msgstr "%-10s %-10s %-10s %-10s %-10s %-12s\n"
diff --git a/po/de.po b/po/de.po
index 8648062c6..ea7f60ccb 100644
--- a/po/de.po
+++ b/po/de.po
@@ -43,9 +43,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: util-linux 2.11q\n"
-"POT-Creation-Date: 2002-05-09 02:51+0200\n"
-"PO-Revision-Date: 2002-04-11 13:27:40+0200\n"
+"Project-Id-Version: util-linux 2.11r\n"
+"POT-Creation-Date: 2002-07-07 17:03+0200\n"
+"PO-Revision-Date: 2002-05-17 11:21:12+0200\n"
"Last-Translator: Michael Piefel <piefel@informatik.hu-berlin.de>\n"
"Language-Team: German <de@li.org>\n"
"MIME-Version: 1.0\n"
@@ -147,31 +147,31 @@ msgstr "NurL RA SGr BGr Startsek Größe Gerät\n"
msgid "usage:\n"
msgstr "Aufruf:\n"
-#: disk-utils/fdformat.c:35
+#: disk-utils/fdformat.c:31
msgid "Formatting ... "
msgstr "Formatieren ... "
-#: disk-utils/fdformat.c:53 disk-utils/fdformat.c:88
+#: disk-utils/fdformat.c:49 disk-utils/fdformat.c:84
msgid "done\n"
msgstr "Beendet\n"
-#: disk-utils/fdformat.c:64
+#: disk-utils/fdformat.c:60
msgid "Verifying ... "
msgstr "Überprüfen ... "
# This is from a perror()
-#: disk-utils/fdformat.c:75
+#: disk-utils/fdformat.c:71
msgid "Read: "
msgstr "Lesen: "
-#: disk-utils/fdformat.c:77
+#: disk-utils/fdformat.c:73
#, c-format
msgid "Problem reading cylinder %d, expected %d, read %d\n"
msgstr ""
"Problem beim Lesen von Zylinder %d, es wurde %d erwartet, aber %d gelesen\n"
# Oh, well, that doesn't sound pretty good.
-#: disk-utils/fdformat.c:83
+#: disk-utils/fdformat.c:79
#, c-format
msgid ""
"bad data in cyl %d\n"
@@ -180,44 +180,150 @@ msgstr ""
"Beschädigte Daten bei Zylinder %d\n"
"Operation wird fortgesetzt ... "
-#: disk-utils/fdformat.c:98
+#: disk-utils/fdformat.c:94
#, c-format
msgid "usage: %s [ -n ] device\n"
msgstr "Aufruf: %s [ -n ] Gerät\n"
# "mkfs aus util-linux-2.10d"
# "mkfs von util-linux-2.10d"
-#: disk-utils/fdformat.c:120 disk-utils/fsck.minix.c:1291
+#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1291
#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:55
-#: disk-utils/mkfs.minix.c:644 disk-utils/mkswap.c:457
-#: disk-utils/setfdprm.c:128 misc-utils/cal.c:246 misc-utils/ddate.c:181
-#: misc-utils/kill.c:188 misc-utils/rename.c:79 misc-utils/script.c:132
+#: disk-utils/mkfs.cramfs.c:665 disk-utils/mkfs.minix.c:644
+#: disk-utils/mkswap.c:457 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1170
+#: misc-utils/cal.c:246 misc-utils/ddate.c:181 misc-utils/kill.c:188
+#: misc-utils/rename.c:79 misc-utils/script.c:132
#, c-format
msgid "%s from %s\n"
msgstr "%s von %s\n"
-#: disk-utils/fdformat.c:134
-#, c-format
-msgid "%s: not a floppy device\n"
+#: disk-utils/fdformat.c:130
+#, fuzzy, c-format
+msgid "%s: not a block device\n"
msgstr "%s ist kein Diskettenlaufwerk\n"
-#: disk-utils/fdformat.c:143
+#: disk-utils/fdformat.c:140
msgid "Could not determine current format type"
msgstr "Konnte das aktuelle Format nicht feststellen"
-#: disk-utils/fdformat.c:144
+#: disk-utils/fdformat.c:141
#, c-format
msgid "%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n"
msgstr "%sseitig, %d Spuren, %d Sektoren/Spur, Totale Kapazität: %dkB.\n"
-#: disk-utils/fdformat.c:145
+#: disk-utils/fdformat.c:142
msgid "Double"
msgstr "Doppel"
-#: disk-utils/fdformat.c:145
+#: disk-utils/fdformat.c:142
msgid "Single"
msgstr "Einfach"
+#: disk-utils/fsck.cramfs.c:98
+#, c-format
+msgid ""
+"usage: %s [-hv] [-x dir] file\n"
+" -h print this help\n"
+" -x dir extract into dir\n"
+" -v be more verbose\n"
+" file file to test\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:191
+#, c-format
+msgid "%s: error %d while decompressing! %p(%d)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:243
+#, fuzzy, c-format
+msgid "%s: size error in symlink `%s'\n"
+msgstr "%s: Fehler beim Lesen auf %s\n"
+
+#: disk-utils/fsck.cramfs.c:258 disk-utils/fsck.cramfs.c:328
+#, c-format
+msgid " uncompressing block at %ld to %ld (%ld)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:287
+#, c-format
+msgid "%s: bogus mode on `%s' (%o)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:319
+#, fuzzy, c-format
+msgid " hole at %ld (%d)\n"
+msgstr "sollte sein (%d, %d, %d)\n"
+
+#: disk-utils/fsck.cramfs.c:337
+#, c-format
+msgid "%s: Non-block (%ld) bytes\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:343
+#, c-format
+msgid "%s: Non-size (%ld vs %ld) bytes\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:392
+#, c-format
+msgid "%s: invalid cramfs--bad path length\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:472
+#, fuzzy, c-format
+msgid "%s: compiled without -x support\n"
+msgstr "umount: Die Unterstützung für -f wurde nicht mit übersetzt\n"
+
+#: disk-utils/fsck.cramfs.c:498
+#, c-format
+msgid "%s: warning--unable to determine filesystem size \n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:508
+#, fuzzy, c-format
+msgid "%s is not a block device or file\n"
+msgstr "%s ist kein Diskettenlaufwerk\n"
+
+#: disk-utils/fsck.cramfs.c:514 disk-utils/fsck.cramfs.c:549
+#, c-format
+msgid "%s: invalid cramfs--file length too short\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:541
+#, c-format
+msgid "%s: invalid cramfs--wrong magic\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:554
+#, c-format
+msgid "%s: warning--file length too long, padded image?\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:564
+#, fuzzy, c-format
+msgid "%s: invalid cramfs--crc error\n"
+msgstr "%s: Fehler beim Parsen der Option\n"
+
+#: disk-utils/fsck.cramfs.c:570
+#, c-format
+msgid "%s: warning--old cramfs image, no CRC\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:592
+#, c-format
+msgid "%s: invalid cramfs--bad superblock\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:608
+#, c-format
+msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:616
+#, c-format
+msgid "%s: invalid cramfs--invalid file data offset\n"
+msgstr ""
+
#: disk-utils/fsck.minix.c:200
#, c-format
msgid "Usage: %s [-larvsmf] /dev/name\n"
@@ -239,12 +345,12 @@ msgstr "Überprüfung abgebrochen. \n"
#: disk-utils/fsck.minix.c:332 disk-utils/fsck.minix.c:356
#, c-format
msgid "Zone nr < FIRSTZONE in file `%s'."
-msgstr ""
+msgstr "Zonennummer < FIRSTZONE in Datei »%s«."
#: disk-utils/fsck.minix.c:336 disk-utils/fsck.minix.c:360
#, c-format
msgid "Zone nr >= ZONES in file `%s'."
-msgstr ""
+msgstr "Zonennummer >= ZONES in Datei »%s«."
#: disk-utils/fsck.minix.c:341 disk-utils/fsck.minix.c:365
msgid "Remove block"
@@ -253,7 +359,7 @@ msgstr "Block entfernen"
#: disk-utils/fsck.minix.c:384
#, c-format
msgid "Read error: unable to seek to block in file '%s'\n"
-msgstr ""
+msgstr "Lesefehler: kann nicht zu Block springen in Datei »%s«\n"
#: disk-utils/fsck.minix.c:390
#, c-format
@@ -270,7 +376,7 @@ msgstr ""
#: disk-utils/fsck.minix.c:411 disk-utils/mkfs.minix.c:285
msgid "seek failed in write_block"
-msgstr ""
+msgstr "»seek« fehlgeschlagen in write_block"
#: disk-utils/fsck.minix.c:414
#, c-format
@@ -279,7 +385,7 @@ msgstr "Fehler beim Schreiben: beschädigter Block in Datei »%s«\n"
#: disk-utils/fsck.minix.c:532
msgid "seek failed in write_super_block"
-msgstr ""
+msgstr "»seek« failed in write_super_block"
#: disk-utils/fsck.minix.c:534 disk-utils/mkfs.minix.c:272
msgid "unable to write super-block"
@@ -611,12 +717,12 @@ msgstr "%s: Fehler beim Lesen auf %s\n"
#: disk-utils/isosize.c:150
#, c-format
msgid "sector count: %d, sector size: %d\n"
-msgstr ""
+msgstr "Sektoranzahl: %d, Sektorgröße: %d\n"
#: disk-utils/isosize.c:198
#, c-format
msgid "%s: option parse error\n"
-msgstr ""
+msgstr "%s: Fehler beim Parsen der Option\n"
#: disk-utils/isosize.c:206
#, c-format
@@ -629,14 +735,16 @@ msgid ""
"Usage: %s [-v] [-N nr-of-inodes] [-V volume-name]\n"
" [-F fsname] device [block-count]\n"
msgstr ""
+"Aufruf: %s [-v] [-N zahl-der-inodes] [-V volume-name]\n"
+" [-F fsname] gerät [block-anzahl]\n"
#: disk-utils/mkfs.bfs.c:135
msgid "volume name too long"
-msgstr "Volume-Name ist zu lang"
+msgstr "volume-Name ist zu lang"
#: disk-utils/mkfs.bfs.c:142
msgid "fsname name too long"
-msgstr ""
+msgstr "fsname ist zu lang"
#: disk-utils/mkfs.bfs.c:167
#, c-format
@@ -672,7 +780,7 @@ msgstr "zu viele Inodes - Maximum ist 512"
msgid "not enough space, need at least %lu blocks"
msgstr "nicht genügend Platz; es werden wenigstens %lu Blöcke benötigt"
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2057
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2069
#, c-format
msgid "Device: %s\n"
msgstr "Gerät: %s\n"
@@ -756,6 +864,130 @@ msgstr "%s: Speicher ist aufgebraucht!\n"
msgid "mkfs version %s (%s)\n"
msgstr "mkfs Version %s (%s)\n"
+#: disk-utils/mkfs.cramfs.c:49
+#, c-format
+msgid ""
+"usage: %s [-h] [-v] [-e edition] [-i file] [-n name] dirname outfile\n"
+" -h print this help\n"
+" -v be verbose\n"
+" -E make all warnings errors (non-zero exit status)\n"
+" -e edition set edition number (part of fsid)\n"
+" -i file insert a file image into the filesystem (requires >= 2.4.0)\n"
+" -n name set name of cramfs filesystem\n"
+" -p pad by %d bytes for boot code\n"
+" -s sort directory entries (old option, ignored)\n"
+" -z make explicit holes (requires >= 2.3.39)\n"
+" dirname root of the filesystem to be compressed\n"
+" outfile output file\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:213
+#, c-format
+msgid ""
+"Very long (%u bytes) filename `%s' found.\n"
+" Please increase MAX_INPUT_NAMELEN in mkcramfs.c and recompile. Exiting.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:371
+msgid "filesystem too big. Exiting.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:422
+msgid ""
+"Exceeded MAXENTRIES. Raise this value in mkcramfs.c and recompile. "
+"Exiting.\n"
+msgstr ""
+
+#. (I don't think this can happen with zlib.)
+#: disk-utils/mkfs.cramfs.c:520
+#, c-format
+msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:537
+#, c-format
+msgid "%6.2f%% (%+d bytes)\t%s\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:705
+#, c-format
+msgid ""
+"warning: guestimate of required size (upper bound) is %LdMB, but maximum "
+"image size is %uMB. We might die prematurely.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:747
+#, fuzzy, c-format
+msgid "Including: %s\n"
+msgstr "Ungültige Nummer: %s\n"
+
+#: disk-utils/mkfs.cramfs.c:753
+#, c-format
+msgid "Directory data: %d bytes\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:761
+#, c-format
+msgid "Everything: %d kilobytes\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:766
+#, c-format
+msgid "Super block: %d bytes\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:773
+#, c-format
+msgid "CRC: %x\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:778
+#, c-format
+msgid "not enough space allocated for ROM image (%Ld allocated, %d used)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:790
+#, c-format
+msgid "ROM image write failed (%d %d)\n"
+msgstr ""
+
+#. (These warnings used to come at the start, but they scroll off the
+#. screen too quickly.)
+#. (can't happen when reading from ext2fs)
+#. bytes, not chars: think UTF8.
+#: disk-utils/mkfs.cramfs.c:799
+#, fuzzy
+msgid "warning: filenames truncated to 255 bytes.\n"
+msgstr "Warnung: »inode count« zu gross.\n"
+
+#: disk-utils/mkfs.cramfs.c:802
+msgid "warning: files were skipped due to errors.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:805
+#, c-format
+msgid "warning: file sizes truncated to %luMB (minus 1 byte).\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:810
+#, c-format
+msgid ""
+"warning: uids truncated to %u bits. (This may be a security concern.)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:815
+#, c-format
+msgid ""
+"warning: gids truncated to %u bits. (This may be a security concern.)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:820
+#, c-format
+msgid ""
+"WARNING: device numbers truncated to %u bits. This almost certainly means\n"
+"that some device files will be wrong.\n"
+msgstr ""
+
#: disk-utils/mkfs.minix.c:181
#, c-format
msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
@@ -897,7 +1129,7 @@ msgid "too many bad pages"
msgstr "Zu viele beschädigte »Seiten«"
#: disk-utils/mkswap.c:359 misc-utils/look.c:182 misc-utils/setterm.c:1130
-#: text-utils/more.c:2062 text-utils/more.c:2073
+#: text-utils/more.c:2063 text-utils/more.c:2074
msgid "Out of memory"
msgstr "Speicher ist aufgebraucht"
@@ -944,7 +1176,7 @@ msgstr "Es wird nicht versucht, Swap auf '%s' anzulegen"
#: disk-utils/mkswap.c:580 disk-utils/mkswap.c:601
msgid "fatal: first page unreadable"
-msgstr ""
+msgstr "fatal: erste Seite nicht lesbar"
#: disk-utils/mkswap.c:586
#, c-format
@@ -962,12 +1194,12 @@ msgstr ""
#: disk-utils/mkswap.c:610
msgid "Unable to set up swap-space: unreadable"
-msgstr ""
+msgstr "Es ist nicht möglich, einen Swapbereich einzurichten: nicht lesbar"
#: disk-utils/mkswap.c:611
-#, fuzzy, c-format
+#, c-format
msgid "Setting up swapspace version %d, size = %lu KiB\n"
-msgstr "Swapbereich Version %d wird angelegt, Größe %lu Bytes\n"
+msgstr "Swapbereich Version %d wird angelegt, Größe %lu KiBytes\n"
#: disk-utils/mkswap.c:617
msgid "unable to rewind swap-device"
@@ -975,11 +1207,11 @@ msgstr ""
#: disk-utils/mkswap.c:620
msgid "unable to write signature page"
-msgstr ""
+msgstr "kann Signaturseite nicht schreiben"
#: disk-utils/mkswap.c:628
msgid "fsync failed"
-msgstr ""
+msgstr "Aufruf von »fsync« fehlgeschlagen"
#: disk-utils/setfdprm.c:31
#, c-format
@@ -1010,12 +1242,12 @@ msgstr ""
#: disk-utils/setfdprm.c:105
#, c-format
msgid " %s [ -c | -y | -n | -d ] dev\n"
-msgstr ""
+msgstr " %s [ -c | -y | -n | -d ] Gerät\n"
#: disk-utils/setfdprm.c:107
#, c-format
msgid " %s [ -c | -y | -n ] dev\n"
-msgstr ""
+msgstr " %s [ -c | -y | -n ] Gerät\n"
# "Unbrauchbar"
#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:1990
@@ -1123,15 +1355,15 @@ msgstr "Partition endet hinter dem Ende der Festplatte"
#: fdisk/cfdisk.c:931
msgid "logical partitions not in disk order"
-msgstr ""
+msgstr "logische Partitionen nicht in Platten-Reihenfolge"
#: fdisk/cfdisk.c:934
msgid "logical partitions overlap"
-msgstr "Logische Partitionen überlappen"
+msgstr "logische Partitionen überlappen"
#: fdisk/cfdisk.c:936
msgid "enlarged logical partitions overlap"
-msgstr ""
+msgstr "vergrößerte logische Partitionen überlappen"
#: fdisk/cfdisk.c:966
msgid ""
@@ -1223,7 +1455,7 @@ msgstr ""
#: fdisk/cfdisk.c:1511
msgid "Do you wish to start with a zero table [y/N] ?"
-msgstr ""
+msgstr "Möchten Sie mit einer Null-Tabelle beginnen [y/N]"
#: fdisk/cfdisk.c:1563
msgid "You specified more cylinders than fit on disk"
@@ -1353,7 +1585,7 @@ msgstr " Logische"
#. odd flag on end
#. type id
#. type name
-#: fdisk/cfdisk.c:1996 fdisk/fdisk.c:1306 fdisk/fdisk.c:1594
+#: fdisk/cfdisk.c:1996 fdisk/fdisk.c:1318 fdisk/fdisk.c:1606
#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:690 fdisk/sfdisk.c:581
msgid "Unknown"
msgstr "Unbekannt"
@@ -1909,7 +2141,7 @@ msgstr ""
" the number of heads and the number of sectors/track.\n"
"\n"
-#: fdisk/fdisk.c:194
+#: fdisk/fdisk.c:195
msgid ""
"Usage: fdisk [-b SSZ] [-u] DISK Change partition table\n"
" fdisk -l [-b SSZ] [-u] DISK List partition table(s)\n"
@@ -1931,7 +2163,7 @@ msgstr ""
"-u: »Anfang« und »Ende« werden in Sektoren statt in Zylindern angegeben\n"
"-b 2048: (für bestimmte MO-Geräte) 2048-Byte-Sektoren benutzen\n"
-#: fdisk/fdisk.c:206
+#: fdisk/fdisk.c:207
msgid ""
"Usage: fdisk [-l] [-b SSZ] [-u] device\n"
"E.g.: fdisk /dev/hda (for the first IDE disk)\n"
@@ -1948,226 +2180,226 @@ msgstr ""
" oder: fdisk /dev/ida/c0d0 (RAID-Festplatten)\n"
" ...\n"
-#: fdisk/fdisk.c:215
+#: fdisk/fdisk.c:216
#, c-format
msgid "Unable to open %s\n"
msgstr "Konnte %s nicht öffnen\n"
-#: fdisk/fdisk.c:219
+#: fdisk/fdisk.c:220
#, c-format
msgid "Unable to read %s\n"
msgstr "Konnte %s nicht lesen\n"
# "Konnte in %s nicht positionieren"
-#: fdisk/fdisk.c:223
+#: fdisk/fdisk.c:224
#, c-format
msgid "Unable to seek on %s\n"
-msgstr ""
+msgstr "Konnte in %s nicht positionieren\n"
-#: fdisk/fdisk.c:227
+#: fdisk/fdisk.c:228
#, c-format
msgid "Unable to write %s\n"
msgstr "Konnte %s nicht schreiben\n"
-#: fdisk/fdisk.c:231
+#: fdisk/fdisk.c:232
#, c-format
msgid "BLKGETSIZE ioctl failed on %s\n"
msgstr ""
-#: fdisk/fdisk.c:235
+#: fdisk/fdisk.c:236
msgid "Unable to allocate any more memory\n"
msgstr "Konnte keinen weiteren Speicher reservieren\n"
-#: fdisk/fdisk.c:238
+#: fdisk/fdisk.c:239
msgid "Fatal error\n"
msgstr "Fataler Fehler\n"
-#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:359 fdisk/fdisk.c:366
-#: fdisk/fdisk.c:389 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:439
-#: fdisk/fdiskbsdlabel.c:124
+#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:360 fdisk/fdisk.c:367
+#: fdisk/fdisk.c:390 fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:440
+#: fdisk/fdiskbsdlabel.c:129
msgid "Command action"
msgstr "Befehl Bedeutung"
-#: fdisk/fdisk.c:323
+#: fdisk/fdisk.c:324
msgid " a toggle a read only flag"
msgstr " a (De)Aktivieren eines Nur-Lese-Flags"
#. sun
-#: fdisk/fdisk.c:324 fdisk/fdisk.c:368
+#: fdisk/fdisk.c:325 fdisk/fdisk.c:369
msgid " b edit bsd disklabel"
msgstr " b »bsd disklabel« bearbeiten"
-#: fdisk/fdisk.c:325
+#: fdisk/fdisk.c:326
msgid " c toggle the mountable flag"
-msgstr " a (De)Aktivieren des Mountable(Einhängbarkeit)-Flags"
+msgstr " c (De)Aktivieren des Mountable(Einhängbarkeit)-Flags"
#. sun
-#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:370
+#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:371
msgid " d delete a partition"
msgstr " d Eine Partition löschen"
-#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:371
+#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:372
msgid " l list known partition types"
msgstr " l Die bekannten Dateisystemtypen anzeigen"
#. sun
-#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:360 fdisk/fdisk.c:372
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
-#: fdisk/fdiskbsdlabel.c:129
+#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:361 fdisk/fdisk.c:373
+#: fdisk/fdisk.c:398 fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
+#: fdisk/fdiskbsdlabel.c:134
msgid " m print this menu"
msgstr " m Dieses Menü anzeigen"
-#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
+#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374
msgid " n add a new partition"
msgstr " n Eine neue Partition anlegen"
-#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:361 fdisk/fdisk.c:374
+#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:362 fdisk/fdisk.c:375
msgid " o create a new empty DOS partition table"
msgstr " o Eine neue leere DOS Partitionstabelle anlegen"
-#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:375 fdisk/fdisk.c:398
-#: fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:376 fdisk/fdisk.c:399
+#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
msgid " p print the partition table"
msgstr " p Die Partitionstabelle anzeigen"
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:362 fdisk/fdisk.c:376
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
-#: fdisk/fdiskbsdlabel.c:132
+#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:363 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:450
+#: fdisk/fdiskbsdlabel.c:137
msgid " q quit without saving changes"
msgstr " q Ende ohne Speichern der Änderungen"
-#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:363 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:364 fdisk/fdisk.c:378
msgid " s create a new empty Sun disklabel"
msgstr " s Einen neuen leeren »Sun disklabel« anlegen"
#. sun
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
msgid " t change a partition's system id"
msgstr " t Den Dateisystemtyp einer Partition ändern"
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
msgid " u change display/entry units"
msgstr " u Die Einheit für die Anzeige/Eingabe ändern"
-#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380 fdisk/fdisk.c:402
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:452
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381 fdisk/fdisk.c:403
+#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
msgid " v verify the partition table"
msgstr " v Die Partitionstabelle überprüfen"
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381 fdisk/fdisk.c:403
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:382 fdisk/fdisk.c:404
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
msgid " w write table to disk and exit"
msgstr ""
" w Die Tabelle auf die Festplatte schreiben und das Programm beenden"
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:383
msgid " x extra functionality (experts only)"
msgstr " x Zusätzliche Funktionen (nur für Experten)"
-#: fdisk/fdisk.c:342
+#: fdisk/fdisk.c:343
msgid " a select bootable partition"
msgstr " a Wählen der bootfähigen Partition"
#. sgi flavour
-#: fdisk/fdisk.c:343
+#: fdisk/fdisk.c:344
msgid " b edit bootfile entry"
msgstr " b Bearbeiten des »bootfile«-Eintrags"
#. sgi
-#: fdisk/fdisk.c:344
+#: fdisk/fdisk.c:345
msgid " c select sgi swap partition"
-msgstr " c Die sgi swap Partition auswählen"
+msgstr " c Die sgi-swap-Partition auswählen"
-#: fdisk/fdisk.c:367
+#: fdisk/fdisk.c:368
msgid " a toggle a bootable flag"
msgstr " a (De)Aktivieren des bootfähig-Flags"
-#: fdisk/fdisk.c:369
+#: fdisk/fdisk.c:370
msgid " c toggle the dos compatibility flag"
msgstr " c (De)Aktivieren des DOS Kompatibilitätsflags"
-#: fdisk/fdisk.c:390
+#: fdisk/fdisk.c:391
msgid " a change number of alternate cylinders"
-msgstr ""
+msgstr " a Die Anzahl der alternierenden Zylinder ändern"
#. sun
-#: fdisk/fdisk.c:391 fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:441
+#: fdisk/fdisk.c:392 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
msgid " c change number of cylinders"
msgstr " c Die Anzahl der Zylinder ändern"
# XXX
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:393 fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:443
msgid " d print the raw data in the partition table"
-msgstr " d Zeige die »raw« Daten der Partitionstabelle an"
+msgstr " d Die »raw«-Daten der Partitionstabelle anzeigen"
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:394
msgid " e change number of extra sectors per cylinder"
-msgstr ""
+msgstr " e Die Anzahl der Extra-Sektoren pro Zylinder ändern"
#. sun
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:395 fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
msgid " h change number of heads"
msgstr " h Die Anzahl der Köpfe ändern"
-#: fdisk/fdisk.c:395
+#: fdisk/fdisk.c:396
msgid " i change interleave factor"
-msgstr ""
+msgstr " i Den Interleave-Faktor ändern"
#. sun
-#: fdisk/fdisk.c:396
+#: fdisk/fdisk.c:397
msgid " o change rotation speed (rpm)"
-msgstr ""
+msgstr " o Umdrehungsgeschwindigkeit ändern (U/min)"
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:450
-#: fdisk/fdiskbsdlabel.c:133
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:451
+#: fdisk/fdiskbsdlabel.c:138
msgid " r return to main menu"
msgstr " r Zurück zum Hauptmenü"
-#: fdisk/fdisk.c:401 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:452
msgid " s change number of sectors/track"
msgstr " s Die Anzahl der Sektoren/Spur ändern"
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:405
msgid " y change number of physical cylinders"
-msgstr ""
+msgstr " y Die Anzahl der physischen Zylinder ändern"
-#: fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:440
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:441
msgid " b move beginning of data in a partition"
msgstr " b Den Datenanfang einer Partition verschieben"
# XXX - Or should this be "logical" instead of "extended" ?
-#: fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:443
+#: fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:444
msgid " e list extended partitions"
msgstr " e Erweiterte Partitionen anzeigen"
#. !sun
-#: fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
msgid " g create an IRIX (SGI) partition table"
msgstr " g Eine IRIX-Partitionstabelle (SGI) anlegen"
#. !sun
-#: fdisk/fdisk.c:444
+#: fdisk/fdisk.c:445
msgid " f fix partition order"
-msgstr ""
+msgstr " f Partitionsreihenfolge korrigieren"
-#: fdisk/fdisk.c:561
+#: fdisk/fdisk.c:562
msgid "You must set"
msgstr "Sie müssen angeben"
-#: fdisk/fdisk.c:575
+#: fdisk/fdisk.c:576
msgid "heads"
msgstr "Köpfe"
-#: fdisk/fdisk.c:577 fdisk/fdisk.c:1142 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:578 fdisk/fdisk.c:1154 fdisk/sfdisk.c:864
msgid "sectors"
msgstr "Sektoren"
-#: fdisk/fdisk.c:579 fdisk/fdisk.c:1142 fdisk/fdiskbsdlabel.c:464
+#: fdisk/fdisk.c:580 fdisk/fdisk.c:1154 fdisk/fdiskbsdlabel.c:469
#: fdisk/sfdisk.c:864
msgid "cylinders"
msgstr "Zylinder"
-#: fdisk/fdisk.c:583
+#: fdisk/fdisk.c:584
#, c-format
msgid ""
"%s%s.\n"
@@ -2176,11 +2408,11 @@ msgstr ""
"%s%s.\n"
"Sie können dies im Zusatzfunktionsmenü tun.\n"
-#: fdisk/fdisk.c:584
+#: fdisk/fdisk.c:585
msgid " and "
msgstr " und "
-#: fdisk/fdisk.c:601
+#: fdisk/fdisk.c:602
#, c-format
msgid ""
"\n"
@@ -2191,27 +2423,34 @@ msgid ""
"2) booting and partitioning software from other OSs\n"
" (e.g., DOS FDISK, OS/2 FDISK)\n"
msgstr ""
+"\n"
+"Die Anzahl der Zylinder für diese Platte ist auf %d gesetzt.\n"
+"Daran ist nichts verkehrt, aber das ist größer als 1024 und kann\n"
+"in bestimmten Konfigurationen Probleme hervorrufen mit:\n"
+"1) Software, die zum Bootzeitpunkt läuft (z. B. ältere LILO-Versionen)\n"
+"2) Boot- und Partitionierungssoftware anderer Betriebssysteme\n"
+" (z. B. DOS FDISK, OS/2 FDISK)\n"
-#: fdisk/fdisk.c:624
+#: fdisk/fdisk.c:625
msgid "Bad offset in primary extended partition\n"
msgstr ""
-#: fdisk/fdisk.c:638
+#: fdisk/fdisk.c:639
#, c-format
msgid "Warning: deleting partitions after %d\n"
-msgstr ""
+msgstr "Warnung: lösche Partitionen hinter %d\n"
-#: fdisk/fdisk.c:655
+#: fdisk/fdisk.c:656
#, c-format
msgid "Warning: extra link pointer in partition table %d\n"
msgstr ""
-#: fdisk/fdisk.c:663
+#: fdisk/fdisk.c:664
#, c-format
msgid "Warning: ignoring extra data in partition table %d\n"
-msgstr ""
+msgstr "Warnung: ignoriere weitere Daten in Partitionstabelle %d\n"
-#: fdisk/fdisk.c:708
+#: fdisk/fdisk.c:709
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"
@@ -2225,17 +2464,23 @@ msgstr ""
"vorherige Inhalt unrettbar verloren.\n"
"\n"
-#: fdisk/fdisk.c:752
+#: fdisk/fdisk.c:753
#, c-format
msgid "Note: sector size is %d (not %d)\n"
msgstr "Hinweis: Die Sektorgröße ist %d (nicht %d)\n"
# XXX
-#: fdisk/fdisk.c:870
+#: fdisk/fdisk.c:883
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:903
+#: fdisk/fdisk.c:914
+msgid ""
+"This disk has both DOS and BSD magic.\n"
+"Give the 'b' command to go to BSD mode.\n"
+msgstr ""
+
+#: fdisk/fdisk.c:924
msgid ""
"Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
"disklabel\n"
@@ -2243,23 +2488,25 @@ msgstr ""
"Das Gerät enthält weder eine gültige DOS-Partitionstabelle,\n"
"noch einen »Sun«, »SGI« oder »OSF disklabel«\n"
-#: fdisk/fdisk.c:920
+#: fdisk/fdisk.c:942
msgid "Internal error\n"
msgstr "Interner Fehler\n"
-#: fdisk/fdisk.c:942
+#: fdisk/fdisk.c:954
#, c-format
msgid "Ignoring extra extended partition %d\n"
msgstr "Die zusätzliche erweiterte Partition %d ignorieren\n"
-#: fdisk/fdisk.c:954
+#: fdisk/fdisk.c:966
#, c-format
msgid ""
"Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
"(rite)\n"
msgstr ""
+"Warnung: Schreiben wird ungültiges Flag 0x%04x in Part.-tabelle %d "
+"korrigieren\n"
-#: fdisk/fdisk.c:976
+#: fdisk/fdisk.c:988
msgid ""
"\n"
"got EOF thrice - exiting..\n"
@@ -2267,138 +2514,147 @@ msgstr ""
"\n"
"dreimalig EOF bekommen - beende...\n"
-#: fdisk/fdisk.c:1015
+#: fdisk/fdisk.c:1027
msgid "Hex code (type L to list codes): "
msgstr "Hex code (L um eine Liste anzuzeigen): "
-#: fdisk/fdisk.c:1054
+#: fdisk/fdisk.c:1066
#, c-format
msgid "%s (%d-%d, default %d): "
-msgstr "%s (%d-%d) [Standardwert: %d]: "
+msgstr "%s (%d-%d, Vorgabe: %d): "
-#: fdisk/fdisk.c:1110
+#: fdisk/fdisk.c:1122
#, c-format
msgid "Using default value %d\n"
msgstr "Benutze den Standardwert %d\n"
-#: fdisk/fdisk.c:1114
+#: fdisk/fdisk.c:1126
msgid "Value out of range.\n"
msgstr "Wert außerhalb des Bereichs.\n"
-#: fdisk/fdisk.c:1124
+#: fdisk/fdisk.c:1136
msgid "Partition number"
msgstr "Partitionsnummer"
-#: fdisk/fdisk.c:1133
+#: fdisk/fdisk.c:1145
#, c-format
msgid "Warning: partition %d has empty type\n"
-msgstr ""
+msgstr "Warnung: Partition %d hat leeren Typ\n"
-#: fdisk/fdisk.c:1140
+#: fdisk/fdisk.c:1152
msgid "cylinder"
msgstr "Zylinder"
-#: fdisk/fdisk.c:1140
+#: fdisk/fdisk.c:1152
msgid "sector"
msgstr "Sektor"
-#: fdisk/fdisk.c:1149
+#: fdisk/fdisk.c:1161
#, 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:1160
+#: fdisk/fdisk.c:1172
#, c-format
msgid "WARNING: Partition %d is an extended partition\n"
msgstr "WARNUNG: Partition %d ist eine erweiterte Partition\n"
-#: fdisk/fdisk.c:1171
+#: fdisk/fdisk.c:1183
msgid "DOS Compatibility flag is set\n"
msgstr "DOS-Kompatibilitätsflag ist gesetzt\n"
-#: fdisk/fdisk.c:1175
+#: fdisk/fdisk.c:1187
msgid "DOS Compatibility flag is not set\n"
msgstr "DOS-Kompatibilitätsflag ist nicht gesetzt\n"
-#: fdisk/fdisk.c:1261
+#: fdisk/fdisk.c:1273
#, c-format
msgid "Partition %d does not exist yet!\n"
msgstr "Partition %d existiert noch nicht!\n"
-#: fdisk/fdisk.c:1266
+#: fdisk/fdisk.c:1278
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 ""
+"Typ 0 bedeutet für viele Systeme (allerdings nicht\n"
+"Linux) freien Platz. Partitionen mit Typ 0 zu haben\n"
+"ist wahrscheinlich unklug. Sie können eine Partition\n"
+"mit dem »d«-Kommando löschen.\n"
-#: fdisk/fdisk.c:1275
+#: fdisk/fdisk.c:1287
msgid ""
"You cannot change a partition into an extended one or vice versa\n"
"Delete it first.\n"
msgstr ""
+"Es ist nicht möglich, eine Partition in eine Erweiterte zu ändern oder\n"
+"umgekehrt. Bitte löschen Sie die Partition zuerst.\n"
-#: fdisk/fdisk.c:1284
+#: fdisk/fdisk.c:1296
msgid ""
"Consider leaving partition 3 as Whole disk (5),\n"
"as SunOS/Solaris expects it and even Linux likes it.\n"
"\n"
msgstr ""
+"Ziehen Sie in Betracht, Partition 3 als »Whole disk« (ganze Platte, 5)\n"
+"zu lassen, wie es SunOS/Solaris erwartet und sogar Linux es mag.\n"
+"\n"
-#: fdisk/fdisk.c:1290
+#: fdisk/fdisk.c:1302
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:1303
+#: fdisk/fdisk.c:1315
#, 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:1357
+#: fdisk/fdisk.c:1369
#, c-format
msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
-msgstr ""
+msgstr "Partition %d hat unterschiedliche phys./log. Anfänge (nicht-Linux?):\n"
-#: fdisk/fdisk.c:1359 fdisk/fdisk.c:1367 fdisk/fdisk.c:1376 fdisk/fdisk.c:1385
+#: fdisk/fdisk.c:1371 fdisk/fdisk.c:1379 fdisk/fdisk.c:1388 fdisk/fdisk.c:1397
#, c-format
msgid " phys=(%d, %d, %d) "
-msgstr ""
+msgstr " phys=(%d, %d, %d) "
-#: fdisk/fdisk.c:1360 fdisk/fdisk.c:1368
+#: fdisk/fdisk.c:1372 fdisk/fdisk.c:1380
#, c-format
msgid "logical=(%d, %d, %d)\n"
-msgstr ""
+msgstr "logisch=(%d, %d, %d)\n"
-#: fdisk/fdisk.c:1365
+#: fdisk/fdisk.c:1377
#, c-format
msgid "Partition %d has different physical/logical endings:\n"
-msgstr ""
+msgstr "Partition %d hat unterschiedliche phys./log. Enden:\n"
-#: fdisk/fdisk.c:1374
+#: fdisk/fdisk.c:1386
#, c-format
msgid "Partition %i does not start on cylinder boundary:\n"
msgstr "Partition %i beginnt nicht an einer Zylindergrenze:\n"
-#: fdisk/fdisk.c:1377
+#: fdisk/fdisk.c:1389
#, c-format
msgid "should be (%d, %d, 1)\n"
-msgstr ""
+msgstr "sollte sein (%d, %d, 1)\n"
-#: fdisk/fdisk.c:1383
+#: fdisk/fdisk.c:1395
#, c-format
msgid "Partition %i does not end on cylinder boundary:\n"
msgstr "Partition %i endet nicht an einer Zylindergrenze:\n"
-#: fdisk/fdisk.c:1386
+#: fdisk/fdisk.c:1398
#, c-format
msgid "should be (%d, %d, %d)\n"
msgstr "sollte sein (%d, %d, %d)\n"
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1405
#, c-format
msgid ""
"\n"
@@ -2411,28 +2667,36 @@ msgstr ""
"Einheiten: %s mit %d * %d Bytes\n"
"\n"
-#: fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1513
msgid ""
"Nothing to do. Ordering is correct already.\n"
"\n"
msgstr ""
+"Keine Änderungen notwendig. Die Anordnung ist schon korrekt.\n"
+"\n"
-#: fdisk/fdisk.c:1565
+# add 1 space to line up:
+# " Device"
+# " Gerät"
+# 2002-05-10 12:15:13 CEST -ke-
+#: fdisk/fdisk.c:1577
#, c-format
msgid "%*s Boot Start End Blocks Id System\n"
-msgstr "%*s boot. Anfang Ende Blöcke Id Dateisystemtyp\n"
+msgstr " %*s boot. Anfang Ende Blöcke Id Dateisystemtyp\n"
-#: fdisk/fdisk.c:1566 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:675
+#: fdisk/fdisk.c:1578 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:675
msgid "Device"
msgstr "Gerät"
-#: fdisk/fdisk.c:1603
+#: fdisk/fdisk.c:1615
msgid ""
"\n"
"Partition table entries are not in disk order\n"
msgstr ""
+"\n"
+"Partitionstabelleneinträge sind nicht in Platten-Reihenfolge\n"
-#: fdisk/fdisk.c:1613
+#: fdisk/fdisk.c:1625
#, c-format
msgid ""
"\n"
@@ -2445,93 +2709,93 @@ msgstr ""
# Ist "Kp" eine gute Abkürzung für "Kopf" ?
# Kf ist besser (2001-11-24 21:30:51 CET -ke-)
-#: fdisk/fdisk.c:1615
+#: fdisk/fdisk.c:1627
msgid "Nr AF Hd Sec Cyl Hd Sec Cyl Start Size ID\n"
msgstr "Nr AF Kp Sek Zyl Kp Sek Zyl Anfang Größe ID\n"
-#: fdisk/fdisk.c:1659
+#: fdisk/fdisk.c:1671
#, c-format
msgid "Warning: partition %d contains sector 0\n"
msgstr "Warnung: Partition %d enthält Sektor 0\n"
-#: fdisk/fdisk.c:1662
+#: fdisk/fdisk.c:1674
#, c-format
msgid "Partition %d: head %d greater than maximum %d\n"
msgstr ""
-#: fdisk/fdisk.c:1665
+#: fdisk/fdisk.c:1677
#, c-format
msgid "Partition %d: sector %d greater than maximum %d\n"
msgstr ""
-#: fdisk/fdisk.c:1668
+#: fdisk/fdisk.c:1680
#, c-format
msgid "Partitions %d: cylinder %d greater than maximum %d\n"
msgstr ""
-#: fdisk/fdisk.c:1672
+#: fdisk/fdisk.c:1684
#, c-format
msgid "Partition %d: previous sectors %d disagrees with total %d\n"
msgstr ""
-#: fdisk/fdisk.c:1704
+#: fdisk/fdisk.c:1716
#, c-format
msgid "Warning: bad start-of-data in partition %d\n"
msgstr ""
-#: fdisk/fdisk.c:1712
+#: fdisk/fdisk.c:1724
#, c-format
msgid "Warning: partition %d overlaps partition %d.\n"
msgstr "Warnung: Partition %d überlappt mit Partition %d.\n"
-#: fdisk/fdisk.c:1732
+#: fdisk/fdisk.c:1744
#, c-format
msgid "Warning: partition %d is empty\n"
msgstr "Warnung: Partition %d ist leer\n"
-#: fdisk/fdisk.c:1737
+#: fdisk/fdisk.c:1749
#, 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:1743
+#: fdisk/fdisk.c:1755
#, c-format
msgid "Total allocated sectors %d greater than the maximum %d\n"
msgstr ""
-#: fdisk/fdisk.c:1746
+#: fdisk/fdisk.c:1758
#, c-format
msgid "%d unallocated sectors\n"
msgstr "%d unbenutzte Sektoren\n"
-#: fdisk/fdisk.c:1759 fdisk/fdisksgilabel.c:661 fdisk/fdisksunlabel.c:505
+#: fdisk/fdisk.c:1771 fdisk/fdisksgilabel.c:661 fdisk/fdisksunlabel.c:505
#, c-format
msgid "Partition %d is already defined. Delete it before re-adding it.\n"
-msgstr ""
+msgstr "Partition %d ist schon festgelegt. Vor Wiederanlegen bitte löschen.\n"
# %s can be "Sektor" or "Zylinder".
-#: fdisk/fdisk.c:1780 fdisk/fdiskbsdlabel.c:279 fdisk/fdisksgilabel.c:683
+#: fdisk/fdisk.c:1792 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:683
#: fdisk/fdisksunlabel.c:520
#, c-format
msgid "First %s"
msgstr "Erster %s"
-#: fdisk/fdisk.c:1795 fdisk/fdisksunlabel.c:561
+#: fdisk/fdisk.c:1807 fdisk/fdisksunlabel.c:561
#, c-format
msgid "Sector %d is already allocated\n"
msgstr "Sektor %d wird bereits benutzt\n"
-#: fdisk/fdisk.c:1831
+#: fdisk/fdisk.c:1843
msgid "No free sectors available\n"
msgstr "Es sind keine freien Sektoren verfügbar\n"
-#: fdisk/fdisk.c:1840 fdisk/fdiskbsdlabel.c:286 fdisk/fdisksunlabel.c:572
+#: fdisk/fdisk.c:1852 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:572
#, 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:1905
+#: fdisk/fdisk.c:1917
msgid ""
"\tSorry - this fdisk cannot handle AIX disk labels.\n"
"\tIf you want to add DOS-type partitions, create\n"
@@ -2539,15 +2803,15 @@ msgid ""
"\tWARNING: This will destroy the present disk contents.\n"
msgstr ""
-#: fdisk/fdisk.c:1914 fdisk/fdiskbsdlabel.c:613
+#: fdisk/fdisk.c:1926 fdisk/fdiskbsdlabel.c:617
msgid "The maximum number of partitions has been created\n"
msgstr "Die maximale Anzahl von Partitionen wurde erzeugt\n"
-#: fdisk/fdisk.c:1924
+#: fdisk/fdisk.c:1936
msgid "You must delete some partition and add an extended partition first\n"
msgstr ""
-#: fdisk/fdisk.c:1929
+#: fdisk/fdisk.c:1941
#, c-format
msgid ""
"Command action\n"
@@ -2558,20 +2822,20 @@ msgstr ""
" %s\n"
" p Primäre Partition (1-4)\n"
-#: fdisk/fdisk.c:1931
+#: fdisk/fdisk.c:1943
msgid "l logical (5 or over)"
msgstr "l Logische Partition (5 oder größer)"
-#: fdisk/fdisk.c:1931
+#: fdisk/fdisk.c:1943
msgid "e extended"
msgstr "e Erweiterte"
-#: fdisk/fdisk.c:1948
+#: fdisk/fdisk.c:1960
#, c-format
msgid "Invalid partition number for type `%c'\n"
msgstr "Ungültige Partitionsnummer für den Typ »%c«\n"
-#: fdisk/fdisk.c:1984
+#: fdisk/fdisk.c:1996
msgid ""
"The partition table has been altered!\n"
"\n"
@@ -2579,11 +2843,11 @@ msgstr ""
"Die Partitionstabelle wurde verändert!\n"
"\n"
-#: fdisk/fdisk.c:1993
+#: fdisk/fdisk.c:2005
msgid "Calling ioctl() to re-read partition table.\n"
msgstr ""
-#: fdisk/fdisk.c:2009
+#: fdisk/fdisk.c:2021
#, c-format
msgid ""
"\n"
@@ -2592,7 +2856,7 @@ msgid ""
"The new table will be used at the next reboot.\n"
msgstr ""
-#: fdisk/fdisk.c:2019
+#: fdisk/fdisk.c:2031
msgid ""
"\n"
"WARNING: If you have created or modified any DOS 6.x\n"
@@ -2604,97 +2868,96 @@ msgstr ""
"oder verändert haben, dann schauen Sie bitte in die\n"
"fdisk-manual-Seite nach weiteren Informationen\n"
-#: fdisk/fdisk.c:2026
+#: fdisk/fdisk.c:2038
msgid "Syncing disks.\n"
msgstr ""
-#: fdisk/fdisk.c:2073
+#: fdisk/fdisk.c:2085
#, c-format
msgid "Partition %d has no data area\n"
msgstr "Partition %d hat keinen Datenbereich\n"
-#: fdisk/fdisk.c:2078
+#: fdisk/fdisk.c:2090
msgid "New beginning of data"
msgstr ""
# That sounds pretty ummm...
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2106
msgid "Expert command (m for help): "
msgstr "Expertenkommando (m für Hilfe): "
-#: fdisk/fdisk.c:2107
+#: fdisk/fdisk.c:2119
msgid "Number of cylinders"
msgstr "Anzahl der Zylinder"
-#: fdisk/fdisk.c:2134
+#: fdisk/fdisk.c:2146
msgid "Number of heads"
msgstr "Anzahl der Köpfe"
-#: fdisk/fdisk.c:2159
+#: fdisk/fdisk.c:2171
msgid "Number of sectors"
msgstr "Anzahl der Sektoren"
-#: fdisk/fdisk.c:2162
+#: fdisk/fdisk.c:2174
msgid "Warning: setting sector offset for DOS compatiblity\n"
msgstr ""
-#: fdisk/fdisk.c:2237
+#: fdisk/fdisk.c:2249
#, 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:2251
+#: fdisk/fdisk.c:2263
#, c-format
msgid "Cannot open %s\n"
msgstr "Konnte %s nicht öffnen\n"
-#: fdisk/fdisk.c:2267 fdisk/sfdisk.c:2363
+#: fdisk/fdisk.c:2279 fdisk/sfdisk.c:2363
#, c-format
msgid "cannot open %s\n"
msgstr "Konnte %s nicht öffnen\n"
-#: fdisk/fdisk.c:2289
+#: fdisk/fdisk.c:2301
#, c-format
msgid "%c: unknown command\n"
msgstr "%c: Unbekannter Befehl\n"
-#: fdisk/fdisk.c:2339
+#: fdisk/fdisk.c:2351
msgid "This kernel finds the sector size itself - -b option ignored\n"
msgstr ""
-#: fdisk/fdisk.c:2342
+#: fdisk/fdisk.c:2355
msgid ""
"Warning: the -b (set sector size) option should be used with one specified "
"device\n"
msgstr ""
-#: fdisk/fdisk.c:2405
+#. OSF label, and no DOS label
+#: fdisk/fdisk.c:2414
#, c-format
-msgid ""
-"Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
-"To return to DOS partition table mode, use the 'r' command.\n"
+msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
msgstr ""
-#: fdisk/fdisk.c:2413
+#: fdisk/fdisk.c:2424
msgid "Command (m for help): "
msgstr "Befehl (m für Hilfe): "
-#: fdisk/fdisk.c:2429
+#: fdisk/fdisk.c:2440
#, c-format
msgid ""
"\n"
"The current boot file is: %s\n"
msgstr ""
-#: fdisk/fdisk.c:2431
+#: fdisk/fdisk.c:2442
msgid "Please enter the name of the new boot file: "
msgstr ""
-#: fdisk/fdisk.c:2433
+#: fdisk/fdisk.c:2444
msgid "Boot file unchanged\n"
msgstr ""
-#: fdisk/fdisk.c:2497
+#: fdisk/fdisk.c:2508
msgid ""
"\n"
"\tSorry, no experts menu for SGI partition tables available.\n"
@@ -2717,7 +2980,7 @@ msgid ""
"\t machine. (Otherwise you become an AIXpert)."
msgstr ""
-#: fdisk/fdiskbsdlabel.c:117
+#: fdisk/fdiskbsdlabel.c:122
#, c-format
msgid ""
"\n"
@@ -2726,168 +2989,168 @@ msgstr ""
"\n"
"»BSD label« von %s\n"
-#: fdisk/fdiskbsdlabel.c:125
+#: fdisk/fdiskbsdlabel.c:130
msgid " d delete a BSD partition"
msgstr " d Eine BSD-Partition löschen"
-#: fdisk/fdiskbsdlabel.c:126
+#: fdisk/fdiskbsdlabel.c:131
msgid " e edit drive data"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:127
+#: fdisk/fdiskbsdlabel.c:132
msgid " i install bootstrap"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:128
+#: fdisk/fdiskbsdlabel.c:133
msgid " l list known filesystem types"
msgstr " l Die bekannten Dateisystemtypen anzeigen"
-#: fdisk/fdiskbsdlabel.c:130
+#: fdisk/fdiskbsdlabel.c:135
msgid " n add a new BSD partition"
msgstr " n Eine neue BSD-Partition anlegen"
-#: fdisk/fdiskbsdlabel.c:131
+#: fdisk/fdiskbsdlabel.c:136
msgid " p print BSD partition table"
msgstr " p Die BSD-Partitionstabelle anzeigen"
-#: fdisk/fdiskbsdlabel.c:134
+#: fdisk/fdiskbsdlabel.c:139
msgid " s show complete disklabel"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:135
+#: fdisk/fdiskbsdlabel.c:140
msgid " t change a partition's filesystem id"
msgstr " t Den Dateisystemtyp einer Partition ändern"
-#: fdisk/fdiskbsdlabel.c:136
+#: fdisk/fdiskbsdlabel.c:141
msgid " u change units (cylinders/sectors)"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:137
+#: fdisk/fdiskbsdlabel.c:142
msgid " w write disklabel to disk"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:139
+#: fdisk/fdiskbsdlabel.c:144
msgid " x link BSD partition to non-BSD partition"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:171
+#: fdisk/fdiskbsdlabel.c:176
#, c-format
msgid "Partition %s has invalid starting sector 0.\n"
msgstr "Partition %s hat einen ungültigen Startsektor 0.\n"
-#: fdisk/fdiskbsdlabel.c:175
+#: fdisk/fdiskbsdlabel.c:180
#, c-format
msgid "Reading disklabel of %s at sector %d.\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:185
+#: fdisk/fdiskbsdlabel.c:190
#, c-format
msgid "There is no *BSD partition on %s.\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:199
+#: fdisk/fdiskbsdlabel.c:204
msgid "BSD disklabel command (m for help): "
msgstr "»BSD disklabel« Befehl (m für Hilfe): "
-#: fdisk/fdiskbsdlabel.c:313
+#: fdisk/fdiskbsdlabel.c:318
#, c-format
msgid "type: %s\n"
msgstr "Typ: %s\n"
-#: fdisk/fdiskbsdlabel.c:315
+#: fdisk/fdiskbsdlabel.c:320
#, c-format
msgid "type: %d\n"
msgstr "Typ: %d\n"
-#: fdisk/fdiskbsdlabel.c:316
+#: fdisk/fdiskbsdlabel.c:321
#, c-format
msgid "disk: %.*s\n"
msgstr "Festplatte: %.*s\n"
-#: fdisk/fdiskbsdlabel.c:317
+#: fdisk/fdiskbsdlabel.c:322
#, c-format
msgid "label: %.*s\n"
msgstr "Label: %.*s\n"
# I currently don't know a better translation
-#: fdisk/fdiskbsdlabel.c:318
+#: fdisk/fdiskbsdlabel.c:323
msgid "flags:"
msgstr "Flags:"
-#: fdisk/fdiskbsdlabel.c:320
+#: fdisk/fdiskbsdlabel.c:325
msgid " removable"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:322
+#: fdisk/fdiskbsdlabel.c:327
msgid " ecc"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:324
+#: fdisk/fdiskbsdlabel.c:329
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:328
+#: fdisk/fdiskbsdlabel.c:333
#, c-format
msgid "bytes/sector: %ld\n"
msgstr "Bytes/Sektor: %ld\n"
-#: fdisk/fdiskbsdlabel.c:329
+#: fdisk/fdiskbsdlabel.c:334
#, c-format
msgid "sectors/track: %ld\n"
msgstr "Sektoren/Spur: %ld\n"
-#: fdisk/fdiskbsdlabel.c:330
+#: fdisk/fdiskbsdlabel.c:335
#, c-format
msgid "tracks/cylinder: %ld\n"
msgstr "Spuren/Zylinder: %ld\n"
-#: fdisk/fdiskbsdlabel.c:331
+#: fdisk/fdiskbsdlabel.c:336
#, c-format
msgid "sectors/cylinder: %ld\n"
msgstr "Sektoren/Zylinder: %ld\n"
-#: fdisk/fdiskbsdlabel.c:332
+#: fdisk/fdiskbsdlabel.c:337
#, c-format
msgid "cylinders: %ld\n"
msgstr "Zylinder: %ld\n"
-#: fdisk/fdiskbsdlabel.c:333
+#: fdisk/fdiskbsdlabel.c:338
#, c-format
msgid "rpm: %d\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:334
+#: fdisk/fdiskbsdlabel.c:339
#, c-format
msgid "interleave: %d\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:335
+#: fdisk/fdiskbsdlabel.c:340
#, c-format
msgid "trackskew: %d\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:336
+#: fdisk/fdiskbsdlabel.c:341
#, c-format
msgid "cylinderskew: %d\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:337
+#: fdisk/fdiskbsdlabel.c:342
#, c-format
msgid "headswitch: %ld\t\t# milliseconds\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:339
+#: fdisk/fdiskbsdlabel.c:344
#, c-format
msgid "track-to-track seek: %ld\t# milliseconds\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:341
+#: fdisk/fdiskbsdlabel.c:346
msgid "drivedata: "
msgstr ""
-#: fdisk/fdiskbsdlabel.c:350
+#: fdisk/fdiskbsdlabel.c:355
#, c-format
msgid ""
"\n"
@@ -2896,97 +3159,97 @@ msgstr ""
"\n"
"%d Partitionen:\n"
-#: fdisk/fdiskbsdlabel.c:351
+#: fdisk/fdiskbsdlabel.c:356
msgid "# start end size fstype [fsize bsize cpg]\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:400 fdisk/fdiskbsdlabel.c:403
+#: fdisk/fdiskbsdlabel.c:405 fdisk/fdiskbsdlabel.c:408
#, c-format
msgid "Writing disklabel to %s.\n"
msgstr "Schreibe »disklabel« auf %s.\n"
-#: fdisk/fdiskbsdlabel.c:415 fdisk/fdiskbsdlabel.c:417
+#: fdisk/fdiskbsdlabel.c:420 fdisk/fdiskbsdlabel.c:422
#, c-format
msgid "%s contains no disklabel.\n"
msgstr "%s enthält keinen »disklabel«.\n"
-#: fdisk/fdiskbsdlabel.c:422
+#: fdisk/fdiskbsdlabel.c:427
msgid "Do you want to create a disklabel? (y/n) "
msgstr "Wollen Sie einen »disklabel« anlegen (y/n)? "
-#: fdisk/fdiskbsdlabel.c:461
+#: fdisk/fdiskbsdlabel.c:466
msgid "bytes/sector"
msgstr "Bytes/Sektor"
-#: fdisk/fdiskbsdlabel.c:462
+#: fdisk/fdiskbsdlabel.c:467
msgid "sectors/track"
msgstr "Sektoren/Spur"
-#: fdisk/fdiskbsdlabel.c:463
+#: fdisk/fdiskbsdlabel.c:468
msgid "tracks/cylinder"
msgstr "Spuren/Zylinder"
-#: fdisk/fdiskbsdlabel.c:471
+#: fdisk/fdiskbsdlabel.c:476
msgid "sectors/cylinder"
msgstr "Sektoren/Zylinder"
-#: fdisk/fdiskbsdlabel.c:475
+#: fdisk/fdiskbsdlabel.c:480
msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:477
+#: fdisk/fdiskbsdlabel.c:482
msgid "rpm"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:478
+#: fdisk/fdiskbsdlabel.c:483
msgid "interleave"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:479
+#: fdisk/fdiskbsdlabel.c:484
msgid "trackskew"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:480
+#: fdisk/fdiskbsdlabel.c:485
msgid "cylinderskew"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:481
+#: fdisk/fdiskbsdlabel.c:486
msgid "headswitch"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:482
+#: fdisk/fdiskbsdlabel.c:487
msgid "track-to-track seek"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:523
+#: fdisk/fdiskbsdlabel.c:528
#, c-format
msgid "Bootstrap: %sboot -> boot%s (%s): "
msgstr ""
-#: fdisk/fdiskbsdlabel.c:548
+#: fdisk/fdiskbsdlabel.c:553
msgid "Bootstrap overlaps with disk label!\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:569 fdisk/fdiskbsdlabel.c:571
+#: fdisk/fdiskbsdlabel.c:574 fdisk/fdiskbsdlabel.c:576
#, c-format
msgid "Bootstrap installed on %s.\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:593
+#: fdisk/fdiskbsdlabel.c:598
#, c-format
msgid "Partition (a-%c): "
msgstr "Partition (a-%c): "
-#: fdisk/fdiskbsdlabel.c:624
+#: fdisk/fdiskbsdlabel.c:629
msgid "This partition already exists.\n"
msgstr "Diese Partition existiert bereits.\n"
-#: fdisk/fdiskbsdlabel.c:744
+#: fdisk/fdiskbsdlabel.c:755
#, c-format
msgid "Warning: too many partitions (%d, maximum is %d).\n"
msgstr "Warnung: zu viele Partitionen (%d, Maximum ist %d).\n"
-#: fdisk/fdiskbsdlabel.c:791
+#: fdisk/fdiskbsdlabel.c:803
msgid ""
"\n"
"Syncing disks.\n"
@@ -4835,45 +5098,45 @@ msgstr "getopt (enhanced) 1.1.2\n"
msgid "internal error, contact the author."
msgstr "Interner Fehler, kontaktieren Sie den Autor."
-#: hwclock/cmos.c:168
+#: hwclock/cmos.c:172
msgid "booted from MILO\n"
msgstr "von MILO gebootet\n"
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:181
msgid "Ruffian BCD clock\n"
msgstr "Ruffian BCD Uhr\n"
# Egger
-#: hwclock/cmos.c:193
+#: hwclock/cmos.c:197
#, c-format
msgid "clockport adjusted to 0x%x\n"
msgstr "Uhrport auf 0x%x gestellt\n"
# debug
-#: hwclock/cmos.c:205
+#: hwclock/cmos.c:209
msgid "funky TOY!\n"
msgstr "»funky TOY«!\n"
# The second %s can be:
# "clock read"
# "set time"
-#: hwclock/cmos.c:259
+#: hwclock/cmos.c:263
#, c-format
msgid "%s: atomic %s failed for 1000 iterations!"
msgstr "%s: atomares »%s« schlug bei 1000 Iterationen fehl!"
-#: hwclock/cmos.c:583
+#: hwclock/cmos.c:587
#, c-format
msgid "Cannot open /dev/port: %s"
msgstr "Konnte /dev/port nicht öffnen: %s"
# Egger, not really nice
-#: hwclock/cmos.c:590
+#: hwclock/cmos.c:594
msgid "I failed to get permission because I didn't try.\n"
msgstr "Ich bekam keine Erlaubnis, weil ich es nicht versucht habe.\n"
# Egger
-#: hwclock/cmos.c:593
+#: hwclock/cmos.c:597
#, c-format
msgid "%s is unable to get I/O port access: the iopl(3) call failed.\n"
msgstr ""
@@ -4881,52 +5144,52 @@ msgstr ""
# This is not the correct translation, but it
# explains the situation better.
-#: hwclock/cmos.c:596
+#: hwclock/cmos.c:600
msgid "Probably you need root privileges.\n"
msgstr "Sie benötigen root-Rechte.\n"
# debug
-#: hwclock/hwclock.c:219
+#: hwclock/hwclock.c:223
#, c-format
msgid "Assuming hardware clock is kept in %s time.\n"
msgstr "Die Hardwareuhr läuft vermutlich in %s.\n"
-#: hwclock/hwclock.c:220 hwclock/hwclock.c:314
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
msgid "UTC"
msgstr "UTC"
-#: hwclock/hwclock.c:220 hwclock/hwclock.c:313
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
msgid "local"
msgstr "lokaler Zeit"
# merge with next
-#: hwclock/hwclock.c:297
+#: hwclock/hwclock.c:303
#, c-format
msgid "%s: Warning: unrecognized third line in adjtime file\n"
msgstr "%s: Warnung: Unbekannte dritte Zeile in der adjtime-Datei\n"
-#: hwclock/hwclock.c:299
+#: hwclock/hwclock.c:305
msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
msgstr "(Erwartet: »UTC« oder »LOCAL« oder nichts.)\n"
# XXX
-#: hwclock/hwclock.c:308
+#: hwclock/hwclock.c:312
#, c-format
msgid "Last drift adjustment done at %ld seconds after 1969\n"
msgstr "Letzte Abweichungskorrektur vorgenommen bei %ld Sekunden nach 1969\n"
# XXX
-#: hwclock/hwclock.c:310
+#: hwclock/hwclock.c:314
#, c-format
msgid "Last calibration done at %ld seconds after 1969\n"
msgstr "Letzte Kalibrierung vorgenommen bei %ld Sekunden nach 1969\n"
-#: hwclock/hwclock.c:312
+#: hwclock/hwclock.c:316
#, c-format
msgid "Hardware clock is on %s time\n"
msgstr "Hardwareuhr geht nach %s Zeit\n"
-#: hwclock/hwclock.c:314
+#: hwclock/hwclock.c:318
msgid "unknown"
msgstr "unbekannter"
@@ -4935,56 +5198,42 @@ msgstr "unbekannter"
# kein sendeausfall... ich wart nur auf das anbrechen der nächsten für mich
# relevanten zeiteinheit.
# Egger
-#. -----------------------------------------------------------------------------
-#. 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.
-#.
-#. -----------------------------------------------------------------------------
-#: hwclock/hwclock.c:336
+#: hwclock/hwclock.c:342
msgid "Waiting for clock tick...\n"
msgstr "Warte auf Uhrtick...\n"
# Egger
-#: hwclock/hwclock.c:340
+#: hwclock/hwclock.c:346
msgid "...got clock tick\n"
msgstr "... erhielt Uhrtick\n"
-#: hwclock/hwclock.c:391
+#: hwclock/hwclock.c:399
#, c-format
msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
msgstr "Ungültige Werte in Hardwareuhr: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
-#: hwclock/hwclock.c:399
+#: hwclock/hwclock.c:407
#, c-format
msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
msgstr ""
"Zeit der Hardwareuhr: %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld Sekunden seit 1969\n"
# Egger
-#: hwclock/hwclock.c:427
+#: hwclock/hwclock.c:435
#, c-format
msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
msgstr "Zeit gelesen aus Hardwareuhr: %4d/%.2d/%.2d %02d:%02d:%02d\n"
-#: hwclock/hwclock.c:454
+#: hwclock/hwclock.c:462
#, c-format
msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
msgstr "Stelle die Hardwareuhr auf %.2d:%.2d:%.2d = %ld Sekunden seit 1969\n"
-#: hwclock/hwclock.c:460
+#: hwclock/hwclock.c:468
msgid "Clock not changed - testing only.\n"
msgstr "Die Uhrzeit der Hardwareuhr wurde nicht verstellt - Testmodus.\n"
-#: hwclock/hwclock.c:508
+#: hwclock/hwclock.c:516
#, c-format
msgid ""
"Time elapsed since reference time has been %.6f seconds.\n"
@@ -4996,7 +5245,7 @@ msgstr ""
# Die Registereinträge der Hardwareuhr enthalten Werte, die ungültig
# sind (z.B. der 50. Tag des Monats) oder ausserhalb des unterstützen
# Bereiches (z.B. das Jahr 2095) liegen.
-#: hwclock/hwclock.c:532
+#: hwclock/hwclock.c:540
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"
@@ -5005,21 +5254,21 @@ msgstr ""
"Monats), oder die Werte liegen außerhalb des Bereiches, der unterstützt\n"
"wird (z.B. das Jahr 2095).\n"
-#: hwclock/hwclock.c:542
+#: hwclock/hwclock.c:550
#, c-format
msgid "%s %.6f seconds\n"
msgstr "%s %.6f Sekunden\n"
-#: hwclock/hwclock.c:576
+#: hwclock/hwclock.c:584
msgid "No --date option specified.\n"
msgstr "Es wurde keine »--date«-Option angegeben.\n"
-#: hwclock/hwclock.c:582
+#: hwclock/hwclock.c:590
msgid "--date argument too long\n"
msgstr ""
# The english version is already a little misleading.
-#: hwclock/hwclock.c:589
+#: hwclock/hwclock.c:597
msgid ""
"The value of the --date option is not a valid date.\n"
"In particular, it contains quotation marks.\n"
@@ -5027,21 +5276,21 @@ msgstr ""
"Der Wert der »--date«-Option ist kein gültiges Datum.\n"
"Es darf kein Anführungszeichen enthalten.\n"
-#: hwclock/hwclock.c:597
+#: hwclock/hwclock.c:605
#, c-format
msgid "Issuing date command: %s\n"
msgstr "Der »date«-Befehl wird aufgerufen: %s\n"
-#: hwclock/hwclock.c:601
+#: hwclock/hwclock.c:609
msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
msgstr "Konnte »date« nicht in der /bin/sh-Shell starten. popen() schlug fehl"
-#: hwclock/hwclock.c:609
+#: hwclock/hwclock.c:617
#, c-format
msgid "response from date command = %s\n"
msgstr "Ausgabe des »date«-Befehls: %s\n"
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:619
#, c-format
msgid ""
"The date command issued by %s returned unexpected results.\n"
@@ -5057,7 +5306,7 @@ msgstr ""
"Die Ausgabe war:\n"
" %s\n"
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:631
#, c-format
msgid ""
"The date command issued by %s returned something other than an integer where "
@@ -5075,12 +5324,12 @@ msgstr ""
" %s\n"
# Egger, fixed %s->%d
-#: hwclock/hwclock.c:634
+#: hwclock/hwclock.c:642
#, c-format
msgid "date string %s equates to %ld seconds since 1969.\n"
msgstr "Die Zeichenkette %s entspricht %ld Sekunden seit 1969.\n"
-#: hwclock/hwclock.c:666
+#: hwclock/hwclock.c:674
msgid ""
"The Hardware Clock does not contain a valid time, so we cannot set the "
"System Time from it.\n"
@@ -5089,37 +5338,37 @@ msgstr ""
"es nicht möglich, die Systemzeit zu setzen.\n"
# debug
-#: hwclock/hwclock.c:688
+#: hwclock/hwclock.c:696
msgid "Calling settimeofday:\n"
msgstr "settimeofday() wird aufgerufen:\n"
# not much to translate
# debug
-#: hwclock/hwclock.c:689
+#: hwclock/hwclock.c:697
#, c-format
msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
# not much to translate
# debug
-#: hwclock/hwclock.c:691
+#: hwclock/hwclock.c:699
#, c-format
msgid "\ttz.tz_minuteswest = %d\n"
msgstr "\ttz.tz_minuteswest = %d\n"
-#: hwclock/hwclock.c:694
+#: hwclock/hwclock.c:702
msgid "Not setting system clock because running in test mode.\n"
msgstr "Keine Änderung an der Systemuhr vorgenommen - Testmodus.\n"
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:711
msgid "Must be superuser to set system clock.\n"
msgstr "Sie müssen root sein, um die Systemuhr zu verändern.\n"
-#: hwclock/hwclock.c:704
+#: hwclock/hwclock.c:714
msgid "settimeofday() failed"
msgstr "settimeofday() schlug fehl"
-#: hwclock/hwclock.c:737
+#: hwclock/hwclock.c:744
msgid ""
"Not adjusting drift factor because the Hardware Clock previously contained "
"garbage.\n"
@@ -5127,7 +5376,16 @@ msgstr ""
"Der Driftfaktor wird nicht verändert, da die Hardwareuhr vorher keinen "
"sinnvollen Wert enthielt.\n"
-#: hwclock/hwclock.c:741
+#: hwclock/hwclock.c:749
+#, fuzzy
+msgid ""
+"Not adjusting drift factor because last calibration time is zero,\n"
+"so history is bad and calibration startover is necessary.\n"
+msgstr ""
+"Der Driftfaktor wird nicht verändert, da weniger als ein Tag seit der "
+"letzten Kalibrierung vergangen ist.\n"
+
+#: hwclock/hwclock.c:755
msgid ""
"Not adjusting drift factor because it has been less than a day since the "
"last calibration.\n"
@@ -5136,10 +5394,10 @@ msgstr ""
"letzten Kalibrierung vergangen ist.\n"
# Egger
-#: hwclock/hwclock.c:750
-#, c-format
+#: hwclock/hwclock.c:803
+#, fuzzy, c-format
msgid ""
-"Clock drifted %d seconds in the past %d seconds in spite of a drift factor "
+"Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
"of %f seconds/day.\n"
"Adjusting drift factor by %f seconds/day\n"
msgstr ""
@@ -5148,13 +5406,13 @@ msgstr ""
"Der Faktor wird um %f Sekunden/Tag geändert.\n"
# Egger
-#: hwclock/hwclock.c:801
+#: hwclock/hwclock.c:854
#, c-format
msgid "Time since last adjustment is %d seconds\n"
msgstr "Es vergingen %d Sekunden seit der letzten Anpassung.\n"
# Egger
-#: hwclock/hwclock.c:803
+#: hwclock/hwclock.c:856
#, c-format
msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
msgstr ""
@@ -5162,13 +5420,13 @@ msgstr ""
"Sekunden zugegriffen werden\n"
# merge with next
-#: hwclock/hwclock.c:832
+#: hwclock/hwclock.c:885
msgid "Not updating adjtime file because of testing mode.\n"
msgstr "Die adjtime Datei wird nicht aktualisiert - Testmodus \n"
# "Hätte das folgende in die Datei %s geschrieben:\n"
# passiv, Konjunktiv in der Umschreibungsform
-#: hwclock/hwclock.c:833
+#: hwclock/hwclock.c:886
#, c-format
msgid ""
"Would have written the following to %s:\n"
@@ -5178,12 +5436,12 @@ msgstr ""
"%s"
# "Abweichungsparameter"
-#: hwclock/hwclock.c:857
+#: hwclock/hwclock.c:910
msgid "Drift adjustment parameters not updated.\n"
msgstr "Die Abweichungsparameter wurden nicht verändert.\n"
# "anpassen"
-#: hwclock/hwclock.c:898
+#: hwclock/hwclock.c:951
msgid ""
"The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
msgstr ""
@@ -5191,28 +5449,28 @@ msgstr ""
"werden.\n"
# "Justierung"
-#: hwclock/hwclock.c:922
+#: hwclock/hwclock.c:983
msgid "Needed adjustment is less than one second, so not setting clock.\n"
msgstr ""
"Da die Anpassung weniger als eine Sekunde betragen hätte, wird sie nicht "
"durchgeführt.\n"
-#: hwclock/hwclock.c:948
+#: hwclock/hwclock.c:1009
#, c-format
msgid "Using %s.\n"
msgstr "Benutze %s.\n"
# "Schnittstelle"
-#: hwclock/hwclock.c:950
+#: hwclock/hwclock.c:1011
msgid "No usable clock interface found.\n"
msgstr "Keine brauchbare Uhrschnittstelle gefunden.\n"
# "stellen"
-#: hwclock/hwclock.c:1045
+#: hwclock/hwclock.c:1107
msgid "Unable to set system clock.\n"
msgstr "Konnte die Systemuhr nicht stellen.\n"
-#: hwclock/hwclock.c:1076
+#: hwclock/hwclock.c:1137
msgid ""
"The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
"machine.\n"
@@ -5221,18 +5479,18 @@ msgid ""
msgstr ""
# Egger
-#: hwclock/hwclock.c:1085
+#: hwclock/hwclock.c:1146
msgid "Unable to get the epoch value from the kernel.\n"
msgstr "Kann den Epochenwert nicht vom Kernel bekommen.\n"
# Egger
# "Epochenwert"
-#: hwclock/hwclock.c:1087
+#: hwclock/hwclock.c:1148
#, c-format
msgid "Kernel is assuming an epoch value of %lu\n"
msgstr "Kernel geht von einem Epochenwert von %lu aus.\n"
-#: hwclock/hwclock.c:1090
+#: hwclock/hwclock.c:1151
msgid ""
"To set the epoch value, you must use the 'epoch' option to tell to what "
"value to set it.\n"
@@ -5240,18 +5498,18 @@ msgstr ""
"Um den Epochenwert zu ändern, müssen sie die »epoch«-Option benutzen, um "
"anzugeben auf welchen Wert er gesetzt werden soll.\n"
-#: hwclock/hwclock.c:1093
+#: hwclock/hwclock.c:1154
#, c-format
msgid "Not setting the epoch to %d - testing only.\n"
msgstr "Der Epochenwert wird nicht auf %d gesetzt - Testmodus.\n"
# Egger
-#: hwclock/hwclock.c:1096
+#: hwclock/hwclock.c:1157
msgid "Unable to set the epoch value in the kernel.\n"
msgstr "Kann den Epochenwert im Kernel nicht ändern.\n"
# "Universalzeit"
-#: hwclock/hwclock.c:1125
+#: hwclock/hwclock.c:1191
#, c-format
msgid ""
"hwclock - query and set the hardware clock (RTC)\n"
@@ -5312,67 +5570,67 @@ msgstr ""
" --noadjfile nicht auf /etc/adjtime zugreifen; erfordert Benutzung von\n"
" entweder --utc oder --localtime\n"
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1218
msgid ""
" --jensen, --arc, --srm, --funky-toy\n"
" tell hwclock the type of alpha you have (see hwclock(8))\n"
msgstr ""
-#: hwclock/hwclock.c:1257
+#: hwclock/hwclock.c:1392
#, c-format
msgid "%s takes no non-option arguments. You supplied %d.\n"
msgstr ""
-#: hwclock/hwclock.c:1267
+#: hwclock/hwclock.c:1398
msgid ""
-"You have specified multiple function options.\n"
+"You have specified multiple functions.\n"
"You can only perform one function at a time.\n"
msgstr ""
-#: hwclock/hwclock.c:1273
+#: hwclock/hwclock.c:1405
#, c-format
msgid ""
"%s: The --utc and --localtime options are mutually exclusive. You specified "
"both.\n"
msgstr ""
-#: hwclock/hwclock.c:1279
+#: hwclock/hwclock.c:1412
#, c-format
msgid ""
"%s: The --adjust and --noadjfile options are mutually exclusive. You "
"specified both.\n"
msgstr ""
-#: hwclock/hwclock.c:1285
+#: hwclock/hwclock.c:1419
#, c-format
msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
msgstr ""
-#: hwclock/hwclock.c:1298
+#: hwclock/hwclock.c:1433
msgid "No usable set-to time. Cannot set clock.\n"
msgstr ""
-#: hwclock/hwclock.c:1313
+#: hwclock/hwclock.c:1449
msgid "Sorry, only the superuser can change the Hardware Clock.\n"
msgstr "Sie müssen root sein, um die Hardwareuhr zu ändern.\n"
-#: hwclock/hwclock.c:1317
+#: hwclock/hwclock.c:1454
msgid "Sorry, only the superuser can change the System Clock.\n"
msgstr "Sie müssen root sein, um die Systemuhr zu ändern.\n"
-#: hwclock/hwclock.c:1321
+#: hwclock/hwclock.c:1459
msgid ""
"Sorry, only the superuser can change the Hardware Clock epoch in the "
"kernel.\n"
msgstr "Sie müssen root sein, um den »epoch«-Wert zu ändern.\n"
-#: hwclock/hwclock.c:1341
+#: hwclock/hwclock.c:1479
msgid "Cannot access the Hardware Clock via any known method.\n"
msgstr ""
"Es wurde keine Zugriffsart gefunden, mit der auf die Hardwareuhr zugegriffen "
"werden konnte.\n"
-#: hwclock/hwclock.c:1344
+#: hwclock/hwclock.c:1483
msgid ""
"Use the --debug option to see the details of our search for an access "
"method.\n"
@@ -5381,100 +5639,95 @@ msgstr ""
"anzuzeigen.\n"
# debug
-#: hwclock/kd.c:42
+#: hwclock/kd.c:43
msgid "Waiting in loop for time from KDGHWCLK to change\n"
msgstr ""
-#: hwclock/kd.c:45
+#: hwclock/kd.c:46
msgid "KDGHWCLK ioctl to read time failed"
msgstr ""
"KDGHWCLK ioctl scheiterte beim Versuch die Zeit aus der Hardwareuhr "
"auszulesen."
-#: hwclock/kd.c:66 hwclock/rtc.c:174
+#: hwclock/kd.c:67 hwclock/rtc.c:187
msgid "Timed out waiting for time change.\n"
msgstr ""
-#: hwclock/kd.c:70
+#: hwclock/kd.c:71
msgid "KDGHWCLK ioctl to read time failed in loop"
msgstr ""
"KDGHWCLK ioctl scheiterte beim Versuch die Zeit aus der Hardwareuhr "
"auszulesen."
-#: hwclock/kd.c:92
+#: hwclock/kd.c:93
#, c-format
msgid "ioctl() failed to read time from %s"
msgstr "ioctl() konnte Zeit nicht von %s lesen."
-#: hwclock/kd.c:128
+#: hwclock/kd.c:129
msgid "ioctl KDSHWCLK failed"
msgstr ""
-#: hwclock/kd.c:165
+#: hwclock/kd.c:166
msgid "Can't open /dev/tty1 or /dev/vc/1"
msgstr "Konnte /dev/tty1 oder /dev/vc/1 nicht öffnen"
-#: hwclock/kd.c:170
+#: hwclock/kd.c:171
msgid "KDGHWCLK ioctl failed"
msgstr ""
-#: hwclock/rtc.c:136
+#: hwclock/rtc.c:115 hwclock/rtc.c:208
+#, c-format
+msgid "open() of %s failed"
+msgstr "Konnte %s nicht öffnen"
+
+#: hwclock/rtc.c:149
#, c-format
msgid "ioctl() to %s to read the time failed.\n"
msgstr ""
-#: hwclock/rtc.c:158
+#: hwclock/rtc.c:171
#, c-format
msgid "Waiting in loop for time from %s to change\n"
msgstr ""
-#: hwclock/rtc.c:195 hwclock/rtc.c:250
-#, c-format
-msgid "open() of %s failed"
-msgstr "Konnte %s nicht öffnen"
-
-#: hwclock/rtc.c:213
+#: hwclock/rtc.c:226
#, c-format
msgid "%s does not have interrupt functions. "
msgstr ""
-#: hwclock/rtc.c:222
+#: hwclock/rtc.c:235
#, c-format
msgid "read() to %s to wait for clock tick failed"
msgstr ""
-#: hwclock/rtc.c:231
+#: hwclock/rtc.c:244
#, c-format
msgid "ioctl() to %s to turn off update interrupts failed"
msgstr ""
-#: hwclock/rtc.c:234
+#: hwclock/rtc.c:247
#, c-format
msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
msgstr ""
-#: hwclock/rtc.c:274 hwclock/rtc.c:358 hwclock/rtc.c:404
-#, c-format
-msgid "Unable to open %s"
-msgstr "Konnte %s nicht öffnen"
-
-#: hwclock/rtc.c:300
+#: hwclock/rtc.c:306
#, c-format
msgid "ioctl() to %s to set the time failed.\n"
msgstr ""
# debug
-#: hwclock/rtc.c:306
+#: hwclock/rtc.c:312
#, c-format
msgid "ioctl(%s) was successful.\n"
msgstr "»ioctl(%s)« war erfolgreich.\n"
-#: hwclock/rtc.c:335
+#: hwclock/rtc.c:341
#, c-format
msgid "Open of %s failed"
msgstr "Konnte %s nicht öffnen"
-#: hwclock/rtc.c:353 hwclock/rtc.c:399
+#: hwclock/rtc.c:359 hwclock/rtc.c:405
#, c-format
msgid ""
"To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
@@ -5482,12 +5735,17 @@ msgid ""
"this system.\n"
msgstr ""
-#: hwclock/rtc.c:365
+#: hwclock/rtc.c:364 hwclock/rtc.c:410
+#, c-format
+msgid "Unable to open %s"
+msgstr "Konnte %s nicht öffnen"
+
+#: hwclock/rtc.c:371
#, c-format
msgid "ioctl(RTC_EPOCH_READ) to %s failed"
msgstr ""
-#: hwclock/rtc.c:371
+#: hwclock/rtc.c:377
#, c-format
msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
msgstr ""
@@ -5495,59 +5753,27 @@ msgstr ""
#. kernel would not accept this epoch value
#. Hmm - bad habit, deciding not to do what the user asks
#. just because one believes that the kernel might not like it.
-#: hwclock/rtc.c:391
+#: hwclock/rtc.c:397
#, c-format
msgid "The epoch value may not be less than 1900. You requested %ld\n"
msgstr ""
-#: hwclock/rtc.c:409
+#: hwclock/rtc.c:415
#, c-format
msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
msgstr ""
-#: hwclock/rtc.c:414
+#: hwclock/rtc.c:420
#, c-format
msgid ""
"The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
msgstr ""
-#: hwclock/rtc.c:417
+#: hwclock/rtc.c:423
#, c-format
msgid "ioctl(RTC_EPOCH_SET) to %s failed"
msgstr ""
-#: hwclock/shhopt.c:255 hwclock/shhopt.c:281
-#, c-format
-msgid "invalid number `%s'\n"
-msgstr "Ungültige Zahl: »%s«\n"
-
-#: hwclock/shhopt.c:258 hwclock/shhopt.c:284
-#, c-format
-msgid "number `%s' to `%s' out of range\n"
-msgstr "Der Wert »%s« für »%s« ist außerhalb des Bereiches\n"
-
-#: hwclock/shhopt.c:398
-#, c-format
-msgid "unrecognized option `%s'\n"
-msgstr "unbekannte Option »%s«\n"
-
-# libc: "Die Option »%s« erfordert ein Argument\n"
-#: hwclock/shhopt.c:411 hwclock/shhopt.c:449
-#, c-format
-msgid "option `%s' requires an argument\n"
-msgstr "Option »%s« erwartet ein Argument\n"
-
-# libc: "Die Option »%s« erlaubt kein Argument\n"
-#: hwclock/shhopt.c:417
-#, c-format
-msgid "option `%s' doesn't allow an argument\n"
-msgstr "Option »%s« erwartet kein Argument\n"
-
-#: hwclock/shhopt.c:439
-#, c-format
-msgid "unrecognized option `-%c'\n"
-msgstr "unbekannte Option »-%c«\n"
-
#: login-utils/agetty.c:312
msgid "calling open_tty\n"
msgstr ""
@@ -6571,7 +6797,7 @@ msgstr ""
msgid "fork failed\n"
msgstr ""
-#: login-utils/simpleinit.c:512 text-utils/more.c:1705
+#: login-utils/simpleinit.c:512 text-utils/more.c:1706
msgid "exec failed\n"
msgstr "»exec()« schlug fehl\n"
@@ -6706,11 +6932,11 @@ msgstr "%s: Konnte eine temporäre Datei nicht lesen.\n"
#: misc-utils/cal.c:260
msgid "illegal month value: use 1-12"
-msgstr ""
+msgstr "illegaler Wert für Monat: benutzen Sie 1-12"
#: misc-utils/cal.c:264
msgid "illegal year value: use 1-9999"
-msgstr ""
+msgstr "illegaler Wert für Jahr: benutzen Sie 1-9999"
#. %s is the month name, %d the year number.
#. * you can change the order and/or add something her; eg for
@@ -6720,7 +6946,7 @@ msgstr ""
#: misc-utils/cal.c:371
#, c-format
msgid "%s %d"
-msgstr ""
+msgstr "%s %d"
#: misc-utils/cal.c:674
msgid "usage: cal [-13smjyV] [[month] year]\n"
@@ -6734,7 +6960,7 @@ msgstr "Aufruf: %s [+Format] [Tag Monat Jahr]\n"
#. handle St. Tib's Day
#: misc-utils/ddate.c:252
msgid "St. Tib's Day"
-msgstr ""
+msgstr "St.-Tibs-Tag"
#: misc-utils/kill.c:206
#, c-format
@@ -6867,6 +7093,9 @@ msgid ""
"Use `%s [options] %s' if you really want to use it.\n"
"Script not started.\n"
msgstr ""
+"Warnung: »%s« ist eine Verknüpfung.\n"
+"Benutzen Sie »%s [optionen] %s«, wenn Sie es tatsächlich starten wollen.\n"
+"Script nicht gestartet.\n"
#: misc-utils/script.c:155
msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
@@ -6876,13 +7105,13 @@ msgstr "Aufruf: script [-a] [-f] [-q] [-t] [Datei]\n"
#: misc-utils/script.c:178
#, c-format
msgid "Script started, file is %s\n"
-msgstr "»Script« wurde gestartet, die Datei ist %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:254
#, c-format
msgid "Script started on %s"
-msgstr "»Script« wurde gestartet: %s"
+msgstr "Script wurde gestartet: %s"
# The %s must be at the end, 'cause it contains the \n
#: misc-utils/script.c:325
@@ -6892,12 +7121,12 @@ msgid ""
"Script done on %s"
msgstr ""
"\n"
-"»Script« beendet: %s"
+"Script beendet: %s"
#: misc-utils/script.c:333
#, c-format
msgid "Script done, file is %s\n"
-msgstr "»Script« wurde beendet, die Datei ist %s\n"
+msgstr "Script wurde beendet, die Datei ist %s\n"
#: misc-utils/script.c:344
msgid "openpty failed\n"
@@ -7384,179 +7613,179 @@ 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:379
+#: mount/mount.c:381
#, c-format
msgid "mount: according to mtab, %s is already mounted on %s"
msgstr "mount: Laut mtab ist %s schon auf %s eingehängt"
-#: mount/mount.c:383
+#: mount/mount.c:385
#, c-format
msgid "mount: according to mtab, %s is mounted on %s"
msgstr "mount: Laut mtab ist %s auf %s eingehängt"
-#: mount/mount.c:404
+#: mount/mount.c:406
#, c-format
msgid "mount: can't open %s for writing: %s"
msgstr "mount: Konnte %s nicht zum Schreiben öffnen: %s"
-#: mount/mount.c:419 mount/mount.c:638
+#: mount/mount.c:421 mount/mount.c:640
#, c-format
msgid "mount: error writing %s: %s"
msgstr "mount: Fehler beim Schreiben von %s: %s"
-#: mount/mount.c:426
+#: mount/mount.c:428
#, c-format
msgid "mount: error changing mode of %s: %s"
msgstr "mount: Fehler beim Ändern der Zugriffsrechte von %s: %s"
-#: mount/mount.c:472
+#: mount/mount.c:474
#, c-format
msgid "%s looks like swapspace - not mounted"
msgstr "%s sieht wie ein Swap-Bereich aus - nicht eingehängt"
-#: mount/mount.c:532
+#: mount/mount.c:534
msgid "mount failed"
msgstr "mount ist fehlgeschlagen"
-#: mount/mount.c:534
+#: mount/mount.c:536
#, c-format
msgid "mount: only root can mount %s on %s"
msgstr "mount: Nur »root« kann %s auf %s einhängen"
-#: mount/mount.c:562
+#: mount/mount.c:564
msgid "mount: loop device specified twice"
msgstr "mount: Das »loop«-Gerät wurde zweimal angegeben"
-#: mount/mount.c:567
+#: mount/mount.c:569
msgid "mount: type specified twice"
msgstr "mount: Der Typ wurde doppelt angegeben"
-#: mount/mount.c:579
+#: mount/mount.c:581
msgid "mount: skipping the setup of a loop device\n"
msgstr ""
-#: mount/mount.c:588
+#: mount/mount.c:590
#, c-format
msgid "mount: going to use the loop device %s\n"
msgstr "mount: werde das »loop«-Gerät %s verwenden\n"
-#: mount/mount.c:592
+#: mount/mount.c:594
msgid "mount: failed setting up loop device\n"
msgstr ""
-#: mount/mount.c:596
+#: mount/mount.c:598
msgid "mount: setup loop device successfully\n"
msgstr ""
-#: mount/mount.c:633
+#: mount/mount.c:635
#, c-format
msgid "mount: can't open %s: %s"
msgstr "mount: Konnte %s nicht öffnen: %s"
-#: mount/mount.c:656
+#: mount/mount.c:658
#, c-format
msgid "mount: cannot open %s for setting speed"
msgstr "mount: Kann %s nicht zum Setzen der Geschwindigkeit öffnen"
-#: mount/mount.c:659
+#: mount/mount.c:661
#, c-format
msgid "mount: cannot set speed: %s"
msgstr "mount: Kann die Geschwindigkeit nicht setzen: %s"
-#: mount/mount.c:720 mount/mount.c:1265
+#: mount/mount.c:722 mount/mount.c:1295
#, c-format
msgid "mount: cannot fork: %s"
msgstr "mount: Kann keinen neuen Prozess erzeugen: %s"
-#: mount/mount.c:800
+#: mount/mount.c:802
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:839
+#: mount/mount.c:841
msgid "mount: failed with nfs mount version 4, trying 3..\n"
msgstr "mount: Mit NFS Version 4 fehlgeschlagen, versuche Version 3...\n"
-#: mount/mount.c:850
+#: mount/mount.c:852
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:853
+#: mount/mount.c:855
msgid "mount: you must specify the filesystem type"
msgstr "mount: Sie müssen den Dateisystemtyp angeben"
#. should not happen
-#: mount/mount.c:856
+#: mount/mount.c:858
msgid "mount: mount failed"
msgstr "mount: mount ist fehlgeschlagen"
-#: mount/mount.c:862 mount/mount.c:897
+#: mount/mount.c:864 mount/mount.c:899
#, c-format
msgid "mount: mount point %s is not a directory"
msgstr "mount: Mountpunkt %s ist kein Verzeichnis"
# libc.po: "Keine Berechtigung"
-#: mount/mount.c:864
+#: mount/mount.c:866
msgid "mount: permission denied"
msgstr "mount: Zugriff verweigert"
-#: mount/mount.c:866
+#: mount/mount.c:868
msgid "mount: must be superuser to use mount"
msgstr "mount: muss Superuser sein, um mount zu verwenden"
#. heuristic: if /proc/version exists, then probably proc is mounted
#. proc mounted?
-#: mount/mount.c:870 mount/mount.c:874
+#: mount/mount.c:872 mount/mount.c:876
#, c-format
msgid "mount: %s is busy"
msgstr "mount: %s wird gerade benutzt"
#. no
#. yes, don't mention it
-#: mount/mount.c:876
+#: mount/mount.c:878
msgid "mount: proc already mounted"
msgstr "mount: proc ist bereits eingehängt"
-#: mount/mount.c:878
+#: mount/mount.c:880
#, c-format
msgid "mount: %s already mounted or %s busy"
msgstr "mount: %s ist bereits eingehängt oder %s wird gerade benutzt"
-#: mount/mount.c:884
+#: mount/mount.c:886
#, c-format
msgid "mount: mount point %s does not exist"
msgstr "mount: Einhängepunkt %s existiert nicht"
-#: mount/mount.c:886
+#: mount/mount.c:888
#, c-format
msgid "mount: mount point %s is a symbolic link to nowhere"
msgstr ""
"mount: Einhängepunkt %s ist eine symbolische Verknüpfung,\n"
" deren Ziel nicht existiert"
-#: mount/mount.c:889
+#: mount/mount.c:891
#, c-format
msgid "mount: special device %s does not exist"
msgstr "mount: Gerätedatei %s existiert nicht"
-#: mount/mount.c:899
+#: mount/mount.c:901
#, c-format
msgid ""
"mount: special device %s does not exist\n"
" (a path prefix is not a directory)\n"
msgstr ""
-#: mount/mount.c:912
+#: mount/mount.c:914
#, c-format
msgid "mount: %s not mounted already, or bad option"
msgstr ""
"mount: %s ist noch nicht eingehängt oder es wurden\n"
" ungültige Optionen angegeben"
-#: mount/mount.c:914
+#: mount/mount.c:916
#, c-format
msgid ""
"mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -7566,35 +7795,35 @@ msgstr ""
" »Superblock« von %s ist beschädigt oder es sind\n"
" zu viele Dateisysteme eingehängt"
-#: mount/mount.c:948
+#: mount/mount.c:950
msgid "mount table full"
msgstr "Einhängetabelle ist voll"
-#: mount/mount.c:950
+#: mount/mount.c:952
#, c-format
msgid "mount: %s: can't read superblock"
msgstr "mount: %s: Konnte den Superblock nicht lesen"
-#: mount/mount.c:954
+#: mount/mount.c:956
#, c-format
msgid "mount: %s: unknown device"
msgstr "umount: %s: unbekanntes Gerät"
-#: mount/mount.c:959
+#: mount/mount.c:961
#, 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:971
+#: mount/mount.c:973
#, c-format
msgid "mount: probably you meant %s"
msgstr "mount: Wahrscheinlich meinten sie »%s«"
-#: mount/mount.c:973
+#: mount/mount.c:975
msgid "mount: maybe you meant iso9660 ?"
msgstr "mount: Vielleicht meinten Sie »iso9660«?"
-#: mount/mount.c:976
+#: mount/mount.c:978
#, c-format
msgid "mount: %s has wrong device number or fs type %s not supported"
msgstr ""
@@ -7602,12 +7831,12 @@ msgstr ""
" Dateisystemtyp %s wird nicht unterstützt"
#. strange ...
-#: mount/mount.c:982
+#: mount/mount.c:984
#, c-format
msgid "mount: %s is not a block device, and stat fails?"
msgstr "mount: %s ist kein blockorientiertes Gerät und »stat« schlägt fehl?"
-#: mount/mount.c:984
+#: mount/mount.c:986
#, c-format
msgid ""
"mount: the kernel does not recognize %s as a block device\n"
@@ -7617,99 +7846,105 @@ msgstr ""
" Gerät (Vielleicht hilft »insmod Treiber«?)"
# "versuchen"
-#: mount/mount.c:987
+#: mount/mount.c:989
#, 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:990
+#: mount/mount.c:992
#, c-format
msgid "mount: %s is not a block device"
msgstr "mount: %s ist kein blockorientiertes Gerät"
-#: mount/mount.c:993
+#: mount/mount.c:995
#, c-format
msgid "mount: %s is not a valid block device"
msgstr "mount: %s ist kein gültiges blockorientiertes Gerät"
#. pre-linux 1.1.38, 1.1.41 and later
#. linux 1.1.38 and later
-#: mount/mount.c:996
+#: mount/mount.c:998
msgid "block device "
msgstr "blockorientiertes Gerät "
-#: mount/mount.c:998
+#: mount/mount.c:1000
#, c-format
msgid "mount: cannot mount %s%s read-only"
msgstr "mount: Konnte %s%s nicht im Nur-Lese-Modus einhängen"
-#: mount/mount.c:1002
+#: mount/mount.c:1004
#, c-format
msgid "mount: %s%s is write-protected but explicit `-w' flag given"
msgstr "mount: %s%s is schreibgeschützt, doch Option »-w« ist explizit gegeben"
# That sounds somehow dumb.
-#: mount/mount.c:1018
+#: mount/mount.c:1020
#, c-format
msgid "mount: %s%s is write-protected, mounting read-only"
msgstr "mount: %s%s ist schreibgeschützt, wird eingehängt im Nur-Lese-Modus"
-#: mount/mount.c:1104
+#: mount/mount.c:1107
#, c-format
msgid "mount: the label %s occurs on both %s and %s\n"
msgstr ""
-#: mount/mount.c:1108
+#: mount/mount.c:1111
#, c-format
msgid "mount: %s duplicate - not mounted"
msgstr "mount: %s doppelt - nicht eingehängt"
-#: mount/mount.c:1118
+#: mount/mount.c:1121
#, c-format
msgid "mount: going to mount %s by %s\n"
msgstr "mount: werde %s mit %s einhängen\n"
# I think this should not be translated
-#: mount/mount.c:1119
+#: mount/mount.c:1122
msgid "UUID"
msgstr "UUID"
# dito
-#: mount/mount.c:1119
+#: mount/mount.c:1122
msgid "label"
msgstr "label"
-#: mount/mount.c:1121 mount/mount.c:1521
+#: mount/mount.c:1124 mount/mount.c:1555
msgid "mount: no such partition found"
msgstr "mount: Keine passende Partition gefunden"
-#: mount/mount.c:1129
+#: mount/mount.c:1132
msgid "mount: no type was given - I'll assume nfs because of the colon\n"
msgstr ""
"mount: Kein Typ angegeben - aufgrund des Doppelpunkts wird NFS angenommen\n"
+#: mount/mount.c:1137
+#, fuzzy
+msgid "mount: no type was given - I'll assume smb because of the // prefix\n"
+msgstr ""
+"mount: Kein Typ angegeben - aufgrund des Doppelpunkts wird NFS angenommen\n"
+
#.
#. * Retry in the background.
#.
-#: mount/mount.c:1145
+#: mount/mount.c:1153
#, c-format
msgid "mount: backgrounding \"%s\"\n"
msgstr "mount: »%s« wird im Hintergrund fortgesetzt\n"
# Not realy nice
-#: mount/mount.c:1156
+#: mount/mount.c:1164
#, c-format
msgid "mount: giving up \"%s\"\n"
msgstr "mount: »%s« schlug fehl\n"
-#: mount/mount.c:1216
+#: mount/mount.c:1240
#, c-format
msgid "mount: %s already mounted on %s\n"
msgstr "mount: %s ist bereits auf %s eingehängt\n"
-#: mount/mount.c:1335
+#: mount/mount.c:1369
msgid ""
"Usage: mount -V : print version\n"
" mount -h : print this help\n"
@@ -7756,40 +7991,40 @@ msgstr ""
"Weitere Optionen: [-nfFrsvw] [-o optionen].\n"
"Für viele weitere Details: man 8 mount.\n"
-#: mount/mount.c:1497
+#: mount/mount.c:1531
msgid "mount: only root can do that"
msgstr "mount: Nur »root« kann dies tun"
-#: mount/mount.c:1502
+#: mount/mount.c:1536
#, c-format
msgid "mount: no %s found - creating it..\n"
msgstr "mount: %s nicht gefunden - Erzeuge sie...\n"
-#: mount/mount.c:1516
+#: mount/mount.c:1550
#, c-format
msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
msgstr ""
-#: mount/mount.c:1523
+#: mount/mount.c:1557
#, c-format
msgid "mount: mounting %s\n"
msgstr "mount: Hänge %s ein\n"
-#: mount/mount.c:1532
+#: mount/mount.c:1566
msgid "nothing was mounted"
msgstr "nichts wurde eingehängt"
-#: mount/mount.c:1547
+#: mount/mount.c:1581
#, c-format
msgid "mount: cannot find %s in %s"
msgstr "mount: Konnte %s nicht in %s finden"
-#: mount/mount.c:1562
+#: mount/mount.c:1596
#, c-format
msgid "mount: can't find %s in %s or %s"
msgstr "mount: Konnte %s nicht in %s oder %s finden"
-#: mount/mount_by_label.c:169
+#: mount/mount_by_label.c:199
#, c-format
msgid ""
"mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
@@ -7797,15 +8032,15 @@ msgstr ""
"mount: konnte %s nicht öffnen, also können UUID- und LABEL-Konvertierung\n"
" nicht durchgeführt werden.\n"
-#: mount/mount_by_label.c:295
+#: mount/mount_by_label.c:325
msgid "mount: bad UUID"
msgstr "mount: ungültige UUID"
-#: mount/mount_guess_fstype.c:487
+#: mount/mount_guess_fstype.c:482
msgid "mount: error while guessing filesystem type\n"
msgstr "mount: Fehler beim Erraten des Dateisystemtyps\n"
-#: mount/mount_guess_fstype.c:496
+#: mount/mount_guess_fstype.c:491
#, 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"
@@ -7813,25 +8048,25 @@ msgstr "mount: Es wurde kein Dateisystemtyp für %s angegeben\n"
# Maybe:
# " Es werden alle Dateisystemtypen ausprobiert, die\n"
# " in %s oder %s aufgelistet sind\n"
-#: mount/mount_guess_fstype.c:499
+#: mount/mount_guess_fstype.c:494
#, c-format
msgid " I will try all types mentioned in %s or %s\n"
msgstr ""
" Werde alle Dateisystemtypen probieren, die in %s oder\n"
" %s aufgelistet sind\n"
-#: mount/mount_guess_fstype.c:502
+#: mount/mount_guess_fstype.c:497
msgid " and it looks like this is swapspace\n"
msgstr " und es sieht so aus, als sei dies Swap-Bereich\n"
# Maybe: " Es wird der Typ %s ausprobiert\n"
# or : ... "probieren"
-#: mount/mount_guess_fstype.c:504
+#: mount/mount_guess_fstype.c:499
#, c-format
msgid " I will try type %s\n"
msgstr " Werde den Typ %s versuchen\n"
-#: mount/mount_guess_fstype.c:592
+#: mount/mount_guess_fstype.c:587
#, c-format
msgid "Trying %s\n"
msgstr "Versuche %s\n"
@@ -7926,7 +8161,7 @@ msgstr ""
msgid "bug in xstrndup call"
msgstr "Fehler im Aufruf von xstrndup (s==NULL)"
-#: mount/swapon.c:51
+#: mount/swapon.c:56
#, c-format
msgid ""
"usage: %s [-hV]\n"
@@ -7939,31 +8174,48 @@ msgstr ""
" %s [-v] [-p Priorität] Spezialdatei ...\n"
" %s [-s]\n"
+#: mount/swapon.c:66
+#, fuzzy, c-format
+msgid ""
+"usage: %s [-hV]\n"
+" %s -a [-v]\n"
+" %s [-v] special ...\n"
+msgstr ""
+"Aufruf: %s [-hV]\n"
+" %s -a [-v]\n"
+" %s [-v] [-p Priorität] Spezialdatei ...\n"
+" %s [-s]\n"
+
# The first %s is swapon/swapoff
-#: mount/swapon.c:88
+#: mount/swapon.c:170 mount/swapon.c:234
#, c-format
msgid "%s on %s\n"
msgstr "%s für %s\n"
# stat
-#: mount/swapon.c:93
+#: mount/swapon.c:174
#, c-format
msgid "swapon: cannot stat %s: %s\n"
msgstr "swapon: Konnte »stat« nicht auf %s anwenden: %s\n"
-#: mount/swapon.c:105
+#: mount/swapon.c:185
#, c-format
msgid "swapon: warning: %s has insecure permissions %04o, %04o suggested\n"
msgstr ""
"swapon: Warnung: %s hat unsichere Zugriffsrechte %04o, %04o wird empfohlen\n"
# holes
-#: mount/swapon.c:115
+#: mount/swapon.c:197
#, c-format
msgid "swapon: Skipping file %s - it appears to have holes.\n"
msgstr "swapon: Überspringe die Datei %s - sie scheint Löcher zu enthalten.\n"
-#: mount/swapon.c:222
+#: mount/swapon.c:240
+#, fuzzy
+msgid "Not superuser.\n"
+msgstr "Nicht gesetzt\n"
+
+#: mount/swapon.c:298 mount/swapon.c:386
#, c-format
msgid "%s: cannot open %s: %s\n"
msgstr "%s: Konnte %s nicht öffnen: %s\n"
@@ -8010,7 +8262,7 @@ msgstr "umount: %s: Konnte den »Superblock« nicht schreiben"
#: mount/umount.c:230
#, c-format
msgid "umount: %s: device is busy"
-msgstr "umount: %s: Das Gerät wird momenten noch benutzt"
+msgstr "umount: %s: Das Gerät wird momentan noch benutzt"
#: mount/umount.c:232
#, c-format
@@ -8020,7 +8272,7 @@ msgstr "umount: %s: Nicht gefunden"
#: mount/umount.c:234
#, c-format
msgid "umount: %s: must be superuser to umount"
-msgstr ""
+msgstr "umount: %s: nur der Superuser kann umount durchführen"
#: mount/umount.c:236
#, c-format
@@ -8094,7 +8346,7 @@ msgstr "umount: %s scheint mehrfach eingehängt zu sein"
#: mount/umount.c:558
#, 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)"
+msgstr "umount: fstab enthält %s nicht (Nur root kann es aushängen)"
#: mount/umount.c:561
#, c-format
@@ -8329,22 +8581,22 @@ msgstr "%s: %s (%s)\n"
msgid "%s: unknown argument: %s\n"
msgstr "%s: Unbekanntes Argument: %s\n"
-#: sys-utils/ipcs.c:122
+#: sys-utils/ipcs.c:121
#, c-format
msgid "usage : %s -asmq -tclup \n"
msgstr "Aufruf: %s -asmq -tclup \n"
-#: sys-utils/ipcs.c:123
+#: sys-utils/ipcs.c:122
#, c-format
msgid "\t%s [-s -m -q] -i id\n"
msgstr "\t%s [-s -m -q] -i Id\n"
-#: sys-utils/ipcs.c:124
+#: sys-utils/ipcs.c:123
#, c-format
msgid "\t%s -h for help.\n"
msgstr "\t%s -h für weitere Informationen.\n"
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:129
#, c-format
msgid ""
"%s provides information on ipc facilities for which you have read access.\n"
@@ -8352,7 +8604,7 @@ msgstr ""
"%s liefert Informationen über Einrichtungen von IPC (Inter Process\n"
"Communication), auf die Sie Lesezugriff haben.\n"
-#: sys-utils/ipcs.c:132
+#: sys-utils/ipcs.c:131
msgid ""
"Resource Specification:\n"
"\t-m : shared_mem\n"
@@ -8362,13 +8614,13 @@ msgstr ""
"\t-m : gemeinsamer Speicher\n"
"\t-q : Nachrichten\n"
-#: sys-utils/ipcs.c:133
+#: sys-utils/ipcs.c:132
msgid ""
"\t-s : semaphores\n"
"\t-a : all (default)\n"
msgstr ""
-#: sys-utils/ipcs.c:134
+#: sys-utils/ipcs.c:133
msgid ""
"Output Format:\n"
"\t-t : time\n"
@@ -8380,7 +8632,7 @@ msgstr ""
"\t-p : Pid\n"
"\t-c : Erzeuger\n"
-#: sys-utils/ipcs.c:135
+#: sys-utils/ipcs.c:134
msgid ""
"\t-l : limits\n"
"\t-u : summary\n"
@@ -8388,377 +8640,377 @@ msgstr ""
"\t-l : Grenzen\n"
"\t-u : Zusammenfassung\n"
-#: sys-utils/ipcs.c:136
+#: sys-utils/ipcs.c:135
msgid "-i id [-s -q -m] : details on resource identified by id\n"
msgstr "-i Id [-s -q -m] : Details über mit Id identifizierte Ressource\n"
-#: sys-utils/ipcs.c:268
+#: sys-utils/ipcs.c:267
msgid "kernel not configured for shared memory\n"
msgstr ""
"Der Kernel ist nicht konfiguriert, gemeinsamen Speicher zu unterstützen.\n"
-#: sys-utils/ipcs.c:274
+#: sys-utils/ipcs.c:273
msgid "------ Shared Memory Limits --------\n"
msgstr "----- Gemeinsamer Speicher: Grenzen -----\n"
#. glibc 2.1.3 and all earlier libc's have ints as fields
#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
-#: sys-utils/ipcs.c:279
+#: sys-utils/ipcs.c:278
#, c-format
msgid "max number of segments = %ld\n"
msgstr "Maximale Anzahl der Segmente = %ld\n"
-#: sys-utils/ipcs.c:281
+#: sys-utils/ipcs.c:280
#, c-format
msgid "max seg size (kbytes) = %ld\n"
msgstr "Maximale Segmentgröße (kB) = %ld\n"
-#: sys-utils/ipcs.c:283
+#: sys-utils/ipcs.c:282
#, c-format
msgid "max total shared memory (kbytes) = %ld\n"
msgstr "Maximaler gesamter gemeinsamer Speicher (KByte) = %ld\n"
-#: sys-utils/ipcs.c:285
+#: sys-utils/ipcs.c:284
#, c-format
msgid "min seg size (bytes) = %ld\n"
msgstr "Minimale Segmentgröße (Bytes) = %ld\n"
-#: sys-utils/ipcs.c:290
+#: sys-utils/ipcs.c:289
msgid "------ Shared Memory Status --------\n"
msgstr "----- Gemeinsamer Speicher: Status -----\n"
-#: sys-utils/ipcs.c:291
+#: sys-utils/ipcs.c:290
#, c-format
msgid "segments allocated %d\n"
msgstr "allozierte Segmente %d\n"
-#: sys-utils/ipcs.c:292
+#: sys-utils/ipcs.c:291
#, c-format
msgid "pages allocated %ld\n"
msgstr "allozierte Seiten %ld\n"
-#: sys-utils/ipcs.c:293
+#: sys-utils/ipcs.c:292
#, c-format
msgid "pages resident %ld\n"
msgstr "residente Seiten %ld\n"
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:293
#, c-format
msgid "pages swapped %ld\n"
msgstr "geswappte Seiten %ld\n"
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:294
#, c-format
msgid "Swap performance: %ld attempts\t %ld successes\n"
msgstr "Swapleistung: %ld Versuche\t %ldErfolge\n"
-#: sys-utils/ipcs.c:300
+#: sys-utils/ipcs.c:299
msgid "------ Shared Memory Segment Creators/Owners --------\n"
msgstr "----- Gemeinsamer Speicher: Erzeuger/Besitzer der Segmente -----\n"
-#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:300 sys-utils/ipcs.c:417 sys-utils/ipcs.c:516
#, c-format
msgid "%-10s %-10s %-10s %-10s %-10s %-10s\n"
msgstr "%-10s %-10s %-10s %-10s %-10s %-10s\n"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:308 sys-utils/ipcs.c:315
-#: sys-utils/ipcs.c:321 sys-utils/ipcs.c:425
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:307 sys-utils/ipcs.c:314
+#: sys-utils/ipcs.c:320 sys-utils/ipcs.c:424
msgid "shmid"
msgstr "shmid"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:321 sys-utils/ipcs.c:419
-#: sys-utils/ipcs.c:434 sys-utils/ipcs.c:519 sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:320 sys-utils/ipcs.c:418
+#: sys-utils/ipcs.c:433 sys-utils/ipcs.c:517 sys-utils/ipcs.c:535
msgid "perms"
msgstr "Rechte"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:517
msgid "cuid"
msgstr "cuid"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:517
msgid "cgid"
msgstr "cgid"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:517
msgid "uid"
msgstr "uid"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:517
msgid "gid"
msgstr "gid"
-#: sys-utils/ipcs.c:306
+#: sys-utils/ipcs.c:305
msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
msgstr "----- Gemeinsamer Speicher: Attach/Detach/Change-Zeiten -----\n"
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:306
#, c-format
msgid "%-10s %-10s %-20s %-20s %-20s\n"
msgstr "%-10s %-10s %-20s %-20s %-20s\n"
-#: sys-utils/ipcs.c:308 sys-utils/ipcs.c:315 sys-utils/ipcs.c:321
-#: sys-utils/ipcs.c:425 sys-utils/ipcs.c:434 sys-utils/ipcs.c:525
-#: sys-utils/ipcs.c:531 sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:314 sys-utils/ipcs.c:320
+#: sys-utils/ipcs.c:424 sys-utils/ipcs.c:433 sys-utils/ipcs.c:523
+#: sys-utils/ipcs.c:529 sys-utils/ipcs.c:535
msgid "owner"
msgstr "Besitzer"
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:307
msgid "attached"
msgstr ""
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:307
msgid "detached"
msgstr ""
-#: sys-utils/ipcs.c:309
+#: sys-utils/ipcs.c:308
msgid "changed"
msgstr ""
-#: sys-utils/ipcs.c:313
+#: sys-utils/ipcs.c:312
msgid "------ Shared Memory Creator/Last-op --------\n"
msgstr "----- Gemeinsamer Speicher: Erzeuger/Last-Op -----\n"
-#: sys-utils/ipcs.c:314 sys-utils/ipcs.c:530
+#: sys-utils/ipcs.c:313 sys-utils/ipcs.c:528
#, c-format
msgid "%-10s %-10s %-10s %-10s\n"
msgstr "%-10s %-10s %-10s %-10s\n"
-#: sys-utils/ipcs.c:315
+#: sys-utils/ipcs.c:314
msgid "cpid"
msgstr "cpid"
-#: sys-utils/ipcs.c:315
+#: sys-utils/ipcs.c:314
msgid "lpid"
msgstr "lpid"
-#: sys-utils/ipcs.c:319
+#: sys-utils/ipcs.c:318
msgid "------ Shared Memory Segments --------\n"
msgstr "----- Gemeinsamer Speicher: Segmente -----\n"
-#: sys-utils/ipcs.c:320
+#: sys-utils/ipcs.c:319
#, c-format
msgid "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n"
msgstr "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n"
-#: sys-utils/ipcs.c:321 sys-utils/ipcs.c:434 sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:320 sys-utils/ipcs.c:433 sys-utils/ipcs.c:535
msgid "key"
msgstr ""
-#: sys-utils/ipcs.c:321
+#: sys-utils/ipcs.c:320
msgid "bytes"
msgstr "Bytes"
-#: sys-utils/ipcs.c:322
+#: sys-utils/ipcs.c:321
msgid "nattch"
msgstr ""
-#: sys-utils/ipcs.c:322 sys-utils/ipcs.c:435
+#: sys-utils/ipcs.c:321
msgid "status"
msgstr "Status"
-#: sys-utils/ipcs.c:343 sys-utils/ipcs.c:345 sys-utils/ipcs.c:347
-#: sys-utils/ipcs.c:456 sys-utils/ipcs.c:458 sys-utils/ipcs.c:558
-#: sys-utils/ipcs.c:560 sys-utils/ipcs.c:562 sys-utils/ipcs.c:615
-#: sys-utils/ipcs.c:617 sys-utils/ipcs.c:646 sys-utils/ipcs.c:648
-#: sys-utils/ipcs.c:650 sys-utils/ipcs.c:674
+#: sys-utils/ipcs.c:342 sys-utils/ipcs.c:344 sys-utils/ipcs.c:346
+#: sys-utils/ipcs.c:455 sys-utils/ipcs.c:457 sys-utils/ipcs.c:556
+#: sys-utils/ipcs.c:558 sys-utils/ipcs.c:560 sys-utils/ipcs.c:613
+#: sys-utils/ipcs.c:615 sys-utils/ipcs.c:644 sys-utils/ipcs.c:646
+#: sys-utils/ipcs.c:648 sys-utils/ipcs.c:672
msgid "Not set"
msgstr "Nicht gesetzt"
-#: sys-utils/ipcs.c:372
+#: sys-utils/ipcs.c:371
msgid "dest"
msgstr ""
-#: sys-utils/ipcs.c:373
+#: sys-utils/ipcs.c:372
msgid "locked"
msgstr ""
-#: sys-utils/ipcs.c:393
+#: sys-utils/ipcs.c:392
msgid "kernel not configured for semaphores\n"
msgstr ""
-#: sys-utils/ipcs.c:399
+#: sys-utils/ipcs.c:398
msgid "------ Semaphore Limits --------\n"
msgstr "----- Semaphorengrenzen -----\n"
-#: sys-utils/ipcs.c:403
+#: sys-utils/ipcs.c:402
#, c-format
msgid "max number of arrays = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:404
+#: sys-utils/ipcs.c:403
#, c-format
msgid "max semaphores per array = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:405
+#: sys-utils/ipcs.c:404
#, c-format
msgid "max semaphores system wide = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:405
#, c-format
msgid "max ops per semop call = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:407
+#: sys-utils/ipcs.c:406
#, c-format
msgid "semaphore max value = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:411
+#: sys-utils/ipcs.c:410
msgid "------ Semaphore Status --------\n"
msgstr "----- Semaphorenstatus -----\n"
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:411
#, c-format
msgid "used arrays = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:413
+#: sys-utils/ipcs.c:412
#, c-format
msgid "allocated semaphores = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:417
+#: sys-utils/ipcs.c:416
msgid "------ Semaphore Arrays Creators/Owners --------\n"
msgstr "----- Semaphorenfelder: Erzeuger/Besitzer -----\n"
-#: sys-utils/ipcs.c:419 sys-utils/ipcs.c:434
+#: sys-utils/ipcs.c:418 sys-utils/ipcs.c:433
msgid "semid"
msgstr ""
-#: sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:422
msgid "------ Shared Memory Operation/Change Times --------\n"
msgstr "----- Gemeinsamer Speicher: Operations/Änderungs-Zeiten -----\n"
-#: sys-utils/ipcs.c:424
+#: sys-utils/ipcs.c:423
#, c-format
msgid "%-8s %-10s %-26.24s %-26.24s\n"
msgstr "%-8s %-10s %-26.24s %-26.24s\n"
-#: sys-utils/ipcs.c:425
+#: sys-utils/ipcs.c:424
msgid "last-op"
msgstr ""
-#: sys-utils/ipcs.c:425
+#: sys-utils/ipcs.c:424
msgid "last-changed"
msgstr ""
-#: sys-utils/ipcs.c:432
+#: sys-utils/ipcs.c:431
msgid "------ Semaphore Arrays --------\n"
msgstr "----- Semaphorenfelder -----\n"
-#: sys-utils/ipcs.c:433
+#: sys-utils/ipcs.c:432 sys-utils/ipcs.c:675
#, c-format
-msgid "%-10s %-10s %-10s %-10s %-10s %-12s\n"
-msgstr "%-10s %-10s %-10s %-10s %-10s %-12s\n"
+msgid "%-10s %-10s %-10s %-10s %-10s\n"
+msgstr "%-10s %-10s %-10s %-10s %-10s\n"
-#: sys-utils/ipcs.c:435
+#: sys-utils/ipcs.c:434
msgid "nsems"
msgstr ""
-#: sys-utils/ipcs.c:495
+#: sys-utils/ipcs.c:493
msgid "kernel not configured for message queues\n"
msgstr ""
-#: sys-utils/ipcs.c:503
+#: sys-utils/ipcs.c:501
msgid "------ Messages: Limits --------\n"
msgstr "----- Nachrichten: Grenzen -----\n"
-#: sys-utils/ipcs.c:504
+#: sys-utils/ipcs.c:502
#, c-format
msgid "max queues system wide = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:503
#, c-format
msgid "max size of message (bytes) = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:504
#, c-format
msgid "default max size of queue (bytes) = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:508
msgid "------ Messages: Status --------\n"
msgstr "----- Nachrichten: Status -----\n"
-#: sys-utils/ipcs.c:511
+#: sys-utils/ipcs.c:509
#, c-format
msgid "allocated queues = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:510
#, c-format
msgid "used headers = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:513
+#: sys-utils/ipcs.c:511
#, c-format
msgid "used space = %d bytes\n"
msgstr ""
-#: sys-utils/ipcs.c:517
+#: sys-utils/ipcs.c:515
msgid "------ Message Queues: Creators/Owners --------\n"
msgstr "----- Nachrichtenwarteschlangen: Erzeuger/Besitzer -----\n"
-#: sys-utils/ipcs.c:519 sys-utils/ipcs.c:525 sys-utils/ipcs.c:531
-#: sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:517 sys-utils/ipcs.c:523 sys-utils/ipcs.c:529
+#: sys-utils/ipcs.c:535
msgid "msqid"
msgstr ""
-#: sys-utils/ipcs.c:523
+#: sys-utils/ipcs.c:521
msgid "------ Message Queues Send/Recv/Change Times --------\n"
msgstr "----- Nachrichtenwarteschlangen: Send/Recv/Change-Zeiten -----\n"
-#: sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:522
#, c-format
msgid "%-8s %-10s %-20s %-20s %-20s\n"
msgstr "%-8s %-10s %-20s %-20s %-20s\n"
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:523
msgid "send"
msgstr ""
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:523
msgid "recv"
msgstr ""
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:523
msgid "change"
msgstr ""
-#: sys-utils/ipcs.c:529
+#: sys-utils/ipcs.c:527
msgid "------ Message Queues PIDs --------\n"
msgstr "----- Nachrichtenwarteschlangen: PIDs -----\n"
-#: sys-utils/ipcs.c:531
+#: sys-utils/ipcs.c:529
msgid "lspid"
msgstr ""
-#: sys-utils/ipcs.c:531
+#: sys-utils/ipcs.c:529
msgid "lrpid"
msgstr ""
-#: sys-utils/ipcs.c:535
+#: sys-utils/ipcs.c:533
msgid "------ Message Queues --------\n"
msgstr "----- Nachrichtenwarteschlangen -----\n"
-#: sys-utils/ipcs.c:536
+#: sys-utils/ipcs.c:534
#, c-format
msgid "%-10s %-10s %-10s %-10s %-12s %-12s\n"
msgstr "%-10s %-10s %-10s %-10s %-12s %-12s\n"
-#: sys-utils/ipcs.c:538
+#: sys-utils/ipcs.c:536
msgid "used-bytes"
msgstr ""
-#: sys-utils/ipcs.c:538
+#: sys-utils/ipcs.c:536
msgid "messages"
msgstr ""
-#: sys-utils/ipcs.c:606
+#: sys-utils/ipcs.c:604
#, c-format
msgid ""
"\n"
@@ -8766,118 +9018,113 @@ msgid ""
msgstr ""
# similiar message below.
-#: sys-utils/ipcs.c:607
+#: sys-utils/ipcs.c:605
#, c-format
msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
msgstr ""
# similiar message below.
-#: sys-utils/ipcs.c:609
+#: sys-utils/ipcs.c:607
#, c-format
msgid "mode=%#o\taccess_perms=%#o\n"
msgstr ""
-#: sys-utils/ipcs.c:611
+#: sys-utils/ipcs.c:609
#, c-format
msgid "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n"
msgstr ""
-#: sys-utils/ipcs.c:614
+#: sys-utils/ipcs.c:612
#, c-format
msgid "att_time=%-26.24s\n"
msgstr "att_time = %-26.24s\n"
-#: sys-utils/ipcs.c:616
+#: sys-utils/ipcs.c:614
#, c-format
msgid "det_time=%-26.24s\n"
msgstr "det_time = %-26.24s\n"
-#: sys-utils/ipcs.c:618 sys-utils/ipcs.c:649
+#: sys-utils/ipcs.c:616 sys-utils/ipcs.c:647
#, c-format
msgid "change_time=%-26.24s\n"
msgstr "Änderungszeit = %-26.24s\n"
-#: sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:631
#, c-format
msgid ""
"\n"
"Message Queue msqid=%d\n"
msgstr ""
-#: sys-utils/ipcs.c:634
+#: sys-utils/ipcs.c:632
#, c-format
msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
msgstr ""
-#: sys-utils/ipcs.c:636
+#: sys-utils/ipcs.c:634
#, c-format
msgid "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
msgstr ""
-#: sys-utils/ipcs.c:645
+#: sys-utils/ipcs.c:643
#, c-format
msgid "send_time=%-26.24s\n"
msgstr "Sendezeit = %-26.24s\n"
-#: sys-utils/ipcs.c:647
+#: sys-utils/ipcs.c:645
#, c-format
msgid "rcv_time=%-26.24s\n"
msgstr "Empfangszeit = %-26.24s\n"
-#: sys-utils/ipcs.c:667
+#: sys-utils/ipcs.c:665
#, c-format
msgid ""
"\n"
"Semaphore Array semid=%d\n"
msgstr ""
-#: sys-utils/ipcs.c:668
+#: sys-utils/ipcs.c:666
#, c-format
msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
msgstr "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
-#: sys-utils/ipcs.c:670
+#: sys-utils/ipcs.c:668
#, c-format
msgid "mode=%#o, access_perms=%#o\n"
msgstr ""
-#: sys-utils/ipcs.c:672
+#: sys-utils/ipcs.c:670
#, c-format
msgid "nsems = %ld\n"
msgstr "nsems = %ld\n"
-#: sys-utils/ipcs.c:673
+#: sys-utils/ipcs.c:671
#, c-format
msgid "otime = %-26.24s\n"
msgstr "otime = %-26.24s\n"
-#: sys-utils/ipcs.c:675
+#: sys-utils/ipcs.c:673
#, c-format
msgid "ctime = %-26.24s\n"
msgstr "ctime = %-26.24s\n"
-#: sys-utils/ipcs.c:677
-#, c-format
-msgid "%-10s %-10s %-10s %-10s %-10s\n"
-msgstr "%-10s %-10s %-10s %-10s %-10s\n"
-
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "semnum"
msgstr ""
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "value"
msgstr "Wert"
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "ncount"
msgstr ""
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "zcount"
msgstr ""
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "pid"
msgstr "Pid"
@@ -9123,26 +9370,28 @@ msgstr ""
msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
msgstr "Aufruf: %s [ - ] [ -2 ] [ Datei ... ]\n"
-#: text-utils/column.c:298
+#: text-utils/column.c:297
msgid "line too long"
msgstr "Zeile ist zu lang"
-#: text-utils/column.c:375
+#: text-utils/column.c:374
msgid "usage: column [-tx] [-c columns] [file ...]\n"
msgstr "Aufruf: column [-tx] [-c Spalten] [Datei ...]\n"
#: text-utils/hexsyntax.c:82
msgid "hexdump: bad length value.\n"
-msgstr ""
+msgstr "hexdump: ungültiger Längenwert.\n"
#: text-utils/hexsyntax.c:93
msgid "hexdump: bad skip value.\n"
-msgstr ""
+msgstr "hexdump: ungültiger Überspring-Wert.\n"
#: text-utils/hexsyntax.c:131
msgid ""
"hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
msgstr ""
+"hexdump: [-bcCdovx] [-e fmt] [-f fmt_datei] [-n länge] [-s überspringen] "
+"[datei ...]\n"
#: text-utils/more.c:264
#, c-format
@@ -9218,33 +9467,33 @@ msgstr ""
msgid "Can't open help file"
msgstr "Konnte die Hilfedatei nicht öffnen"
-#: text-utils/more.c:1442 text-utils/more.c:1446
+#: text-utils/more.c:1442 text-utils/more.c:1447
msgid "[Press 'h' for instructions.]"
msgstr "[Drücken Sie ›h‹ für Hilfe.]"
-#: text-utils/more.c:1480
+#: text-utils/more.c:1481
#, c-format
msgid "\"%s\" line %d"
msgstr "»%s« Zeile %d"
-#: text-utils/more.c:1482
+#: text-utils/more.c:1483
#, c-format
msgid "[Not a file] line %d"
msgstr "[Keine Datei] Zeile %d"
-#: text-utils/more.c:1566
+#: text-utils/more.c:1567
msgid " Overflow\n"
msgstr " Ãœberlauf\n"
-#: text-utils/more.c:1613
+#: text-utils/more.c:1614
msgid "...skipping\n"
msgstr "...Ãœberspringe\n"
-#: text-utils/more.c:1643
+#: text-utils/more.c:1644
msgid "Regular expression botch"
msgstr "Fehler beim Ausführen von »re_exec()«"
-#: text-utils/more.c:1655
+#: text-utils/more.c:1656
msgid ""
"\n"
"Pattern not found\n"
@@ -9252,35 +9501,35 @@ msgstr ""
"\n"
"Muster wurde nicht gefunden\n"
-#: text-utils/more.c:1658
+#: text-utils/more.c:1659 text-utils/pg.c:1134 text-utils/pg.c:1285
msgid "Pattern not found"
msgstr "Muster wurde nicht gefunden"
-#: text-utils/more.c:1719
+#: text-utils/more.c:1720
msgid "can't fork\n"
msgstr "Kann keinen neuen Prozess erzeugen\n"
-#: text-utils/more.c:1758
+#: text-utils/more.c:1759
msgid ""
"\n"
"...Skipping "
msgstr ""
"\n"
-"...Springe "
+"...Ãœberspringe "
-#: text-utils/more.c:1763
+#: text-utils/more.c:1764
msgid "...Skipping to file "
msgstr "...Springe zu Datei"
-#: text-utils/more.c:1765
+#: text-utils/more.c:1766
msgid "...Skipping back to file "
msgstr "...Springe zurück zu Datei "
-#: text-utils/more.c:2046
+#: text-utils/more.c:2047
msgid "Line too long"
msgstr "Zeile ist zu lang"
-#: text-utils/more.c:2089
+#: text-utils/more.c:2090
msgid "No previous command to substitute for"
msgstr "Kein vorheriger Befehl, der eingefügt werden könnte"
@@ -9328,8 +9577,103 @@ msgstr "hexdump: Ungültiges Format {%s}\n"
#: text-utils/parse.c:502
#, c-format
msgid "hexdump: bad conversion character %%%s.\n"
+msgstr "hexdump: ungültiges Umwandlungszeichen %%%s.\n"
+
+#: text-utils/pg.c:246
+#, c-format
+msgid ""
+"%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
+msgstr ""
+
+# libc: "Die Option »%s« erfordert ein Argument\n"
+#: text-utils/pg.c:255
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- %s\n"
+msgstr "Option »%s« erwartet ein Argument\n"
+
+#: text-utils/pg.c:263
+#, fuzzy, c-format
+msgid "%s: illegal option -- %s\n"
+msgstr "%s: unzulässige Option -- %c\n"
+
+#: text-utils/pg.c:380
+#, fuzzy
+msgid "...skipping forward\n"
+msgstr "...Ãœberspringe\n"
+
+#: text-utils/pg.c:382
+#, fuzzy
+msgid "...skipping backward\n"
+msgstr "...Ãœberspringe\n"
+
+#: text-utils/pg.c:404
+#, fuzzy
+msgid "No next file"
+msgstr "(Nächste Datei: %s)"
+
+#: text-utils/pg.c:408
+#, fuzzy
+msgid "No previous file"
+msgstr "Keine Partitionen definiert\n"
+
+#: text-utils/pg.c:938
+#, fuzzy, c-format
+msgid "%s: Read error from %s file\n"
+msgstr "%s: Fehler beim Lesen auf %s\n"
+
+#.
+#. * Most likely '\0' in input.
+#.
+#: text-utils/pg.c:944
+#, c-format
+msgid "%s: Unexpected EOF in %s file\n"
+msgstr ""
+
+#: text-utils/pg.c:947
+#, fuzzy, c-format
+msgid "%s: Unknown error in %s file\n"
+msgstr "unbekannter Fehler in ID"
+
+#: text-utils/pg.c:1042
+#, fuzzy, c-format
+msgid "%s: Cannot create tempfile\n"
+msgstr "%s: Konnte eine temporäre Datei nicht lesen.\n"
+
+#: text-utils/pg.c:1051 text-utils/pg.c:1226
+#, fuzzy
+msgid "RE error: "
+msgstr ", Fehler"
+
+#: text-utils/pg.c:1208
+msgid "(EOF)"
+msgstr ""
+
+#: text-utils/pg.c:1234
+msgid "No remembered search string"
+msgstr ""
+
+#: text-utils/pg.c:1317
+#, fuzzy
+msgid "Cannot open "
+msgstr "Konnte %s nicht öffnen\n"
+
+#: text-utils/pg.c:1365
+msgid "saved"
+msgstr ""
+
+#: text-utils/pg.c:1472
+msgid ": !command not allowed in rflag mode.\n"
msgstr ""
+#: text-utils/pg.c:1504
+msgid "fork() failed, try again later\n"
+msgstr ""
+
+#: text-utils/pg.c:1709
+#, fuzzy
+msgid "(Next file: "
+msgstr "(Nächste Datei: %s)"
+
#: text-utils/rev.c:113
msgid "Unable to allocate bufferspace\n"
msgstr "Konnte keinen Speicher für einen Puffer reservieren.\n"
@@ -9364,6 +9708,29 @@ msgstr "Eingabezeile ist zu lang.\n"
msgid "Out of memory when growing buffer.\n"
msgstr "Speicher ist alle beim Vergrößern eines Puffers.\n"
+#~ msgid "invalid number `%s'\n"
+#~ msgstr "Ungültige Zahl: »%s«\n"
+
+#~ msgid "number `%s' to `%s' out of range\n"
+#~ msgstr "Der Wert »%s« für »%s« ist außerhalb des Bereiches\n"
+
+#~ msgid "unrecognized option `%s'\n"
+#~ msgstr "unbekannte Option »%s«\n"
+
+# libc: "Die Option »%s« erfordert ein Argument\n"
+#~ msgid "option `%s' requires an argument\n"
+#~ msgstr "Option »%s« erwartet ein Argument\n"
+
+# libc: "Die Option »%s« erlaubt kein Argument\n"
+#~ msgid "option `%s' doesn't allow an argument\n"
+#~ msgstr "Option »%s« erwartet kein Argument\n"
+
+#~ msgid "unrecognized option `-%c'\n"
+#~ msgstr "unbekannte Option »-%c«\n"
+
+#~ msgid "%-10s %-10s %-10s %-10s %-10s %-12s\n"
+#~ msgstr "%-10s %-10s %-10s %-10s %-10s %-12s\n"
+
#~ msgid "od: od(1) has been depreciated for hexdump(1).\n"
#~ msgstr "od: von od(1) wird zugunsten von hexdump(1) abgeraten.\n"
@@ -9411,10 +9778,6 @@ msgstr "Speicher ist alle beim Vergrößern eines Puffers.\n"
#~ msgstr "Es wurde nichts eingehängt"
#, fuzzy
-#~ msgid "Not set\n"
-#~ msgstr "Nicht gesetzt\n"
-
-#, fuzzy
#~ msgid " swapdev ... same as rdev -s"
#~ msgstr " swapdev ... Das gleiche wie rdev -s"
diff --git a/po/es.po b/po/es.po
index a2b5e7520..f900172a9 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,9 +11,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: util-linux 2.11q\n"
-"POT-Creation-Date: 2002-05-09 02:51+0200\n"
-"PO-Revision-Date: 2002-04-21 19:09+0200\n"
+"Project-Id-Version: util-linux 2.11r\n"
+"POT-Creation-Date: 2002-07-07 17:03+0200\n"
+"PO-Revision-Date: 2002-05-19 14:58+0200\n"
"Last-Translator: Santiago Vila Doncel <sanvila@unex.es>\n"
"Language-Team: Spanish <es@li.org>\n"
"MIME-Version: 1.0\n"
@@ -115,29 +115,29 @@ msgstr "RO RA SSZ BSZ StartSec Size Device\n"
msgid "usage:\n"
msgstr "uso:\n"
-#: disk-utils/fdformat.c:35
+#: disk-utils/fdformat.c:31
msgid "Formatting ... "
msgstr "Formateando... "
-#: disk-utils/fdformat.c:53 disk-utils/fdformat.c:88
+#: disk-utils/fdformat.c:49 disk-utils/fdformat.c:84
msgid "done\n"
msgstr "finalizado\n"
# Nota: Al parecer, en español no se pone espacio antes de ...
-#: disk-utils/fdformat.c:64
+#: disk-utils/fdformat.c:60
msgid "Verifying ... "
msgstr "Verificando... "
-#: disk-utils/fdformat.c:75
+#: disk-utils/fdformat.c:71
msgid "Read: "
msgstr "Leer: "
-#: disk-utils/fdformat.c:77
+#: disk-utils/fdformat.c:73
#, c-format
msgid "Problem reading cylinder %d, expected %d, read %d\n"
msgstr "Problema de lectura en el cilindro %d, se esperaba %d, se leyó %d\n"
-#: disk-utils/fdformat.c:83
+#: disk-utils/fdformat.c:79
#, c-format
msgid ""
"bad data in cyl %d\n"
@@ -146,42 +146,148 @@ msgstr ""
"Datos incorrectos en el cilindro %d\n"
"Continuando... "
-#: disk-utils/fdformat.c:98
+#: disk-utils/fdformat.c:94
#, c-format
msgid "usage: %s [ -n ] device\n"
msgstr "uso: %s [ -n ] dispositivo\n"
-#: disk-utils/fdformat.c:120 disk-utils/fsck.minix.c:1291
+#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1291
#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:55
-#: disk-utils/mkfs.minix.c:644 disk-utils/mkswap.c:457
-#: disk-utils/setfdprm.c:128 misc-utils/cal.c:246 misc-utils/ddate.c:181
-#: misc-utils/kill.c:188 misc-utils/rename.c:79 misc-utils/script.c:132
+#: disk-utils/mkfs.cramfs.c:665 disk-utils/mkfs.minix.c:644
+#: disk-utils/mkswap.c:457 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1170
+#: misc-utils/cal.c:246 misc-utils/ddate.c:181 misc-utils/kill.c:188
+#: misc-utils/rename.c:79 misc-utils/script.c:132
#, c-format
msgid "%s from %s\n"
msgstr "%s de %s\n"
-#: disk-utils/fdformat.c:134
-#, c-format
-msgid "%s: not a floppy device\n"
+#: disk-utils/fdformat.c:130
+#, fuzzy, c-format
+msgid "%s: not a block device\n"
msgstr "%s: no es un dispositivo de disquete\n"
-#: disk-utils/fdformat.c:143
+#: disk-utils/fdformat.c:140
msgid "Could not determine current format type"
msgstr "No se puede determinar el tipo de formato actual"
-#: disk-utils/fdformat.c:144
+#: disk-utils/fdformat.c:141
#, c-format
msgid "%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n"
msgstr "%s caras, %d pistas, %d sectores/pista. Capacidad total %d kB.\n"
-#: disk-utils/fdformat.c:145
+#: disk-utils/fdformat.c:142
msgid "Double"
msgstr "Doble densidad"
-#: disk-utils/fdformat.c:145
+#: disk-utils/fdformat.c:142
msgid "Single"
msgstr "Simple densidad"
+#: disk-utils/fsck.cramfs.c:98
+#, c-format
+msgid ""
+"usage: %s [-hv] [-x dir] file\n"
+" -h print this help\n"
+" -x dir extract into dir\n"
+" -v be more verbose\n"
+" file file to test\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:191
+#, c-format
+msgid "%s: error %d while decompressing! %p(%d)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:243
+#, fuzzy, c-format
+msgid "%s: size error in symlink `%s'\n"
+msgstr "%s: error de búsqueda en %s\n"
+
+#: disk-utils/fsck.cramfs.c:258 disk-utils/fsck.cramfs.c:328
+#, c-format
+msgid " uncompressing block at %ld to %ld (%ld)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:287
+#, c-format
+msgid "%s: bogus mode on `%s' (%o)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:319
+#, fuzzy, c-format
+msgid " hole at %ld (%d)\n"
+msgstr "debe ser (%d, %d, %d)\n"
+
+#: disk-utils/fsck.cramfs.c:337
+#, c-format
+msgid "%s: Non-block (%ld) bytes\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:343
+#, c-format
+msgid "%s: Non-size (%ld vs %ld) bytes\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:392
+#, c-format
+msgid "%s: invalid cramfs--bad path length\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:472
+#, fuzzy, c-format
+msgid "%s: compiled without -x support\n"
+msgstr "%s: no se ha compilado con soporte para minix v2\n"
+
+#: disk-utils/fsck.cramfs.c:498
+#, c-format
+msgid "%s: warning--unable to determine filesystem size \n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:508
+#, fuzzy, c-format
+msgid "%s is not a block device or file\n"
+msgstr "%s: no es un dispositivo de disquete\n"
+
+#: disk-utils/fsck.cramfs.c:514 disk-utils/fsck.cramfs.c:549
+#, c-format
+msgid "%s: invalid cramfs--file length too short\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:541
+#, c-format
+msgid "%s: invalid cramfs--wrong magic\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:554
+#, c-format
+msgid "%s: warning--file length too long, padded image?\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:564
+#, fuzzy, c-format
+msgid "%s: invalid cramfs--crc error\n"
+msgstr "%s: error al analizar la opción\n"
+
+#: disk-utils/fsck.cramfs.c:570
+#, c-format
+msgid "%s: warning--old cramfs image, no CRC\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:592
+#, c-format
+msgid "%s: invalid cramfs--bad superblock\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:608
+#, c-format
+msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:616
+#, c-format
+msgid "%s: invalid cramfs--invalid file data offset\n"
+msgstr ""
+
#: disk-utils/fsck.minix.c:200
#, c-format
msgid "Usage: %s [-larvsmf] /dev/name\n"
@@ -655,7 +761,7 @@ msgstr "demasiados nodos-i; el máximo es 512"
msgid "not enough space, need at least %lu blocks"
msgstr "no hay suficiente espacio, se necesitan al menos %lu bloques"
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2057
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2069
#, c-format
msgid "Device: %s\n"
msgstr "Dispositivo: %s\n"
@@ -740,6 +846,130 @@ msgstr "%s: ¡No queda memoria!\n"
msgid "mkfs version %s (%s)\n"
msgstr "mkfs versión %s (%s)\n"
+#: disk-utils/mkfs.cramfs.c:49
+#, c-format
+msgid ""
+"usage: %s [-h] [-v] [-e edition] [-i file] [-n name] dirname outfile\n"
+" -h print this help\n"
+" -v be verbose\n"
+" -E make all warnings errors (non-zero exit status)\n"
+" -e edition set edition number (part of fsid)\n"
+" -i file insert a file image into the filesystem (requires >= 2.4.0)\n"
+" -n name set name of cramfs filesystem\n"
+" -p pad by %d bytes for boot code\n"
+" -s sort directory entries (old option, ignored)\n"
+" -z make explicit holes (requires >= 2.3.39)\n"
+" dirname root of the filesystem to be compressed\n"
+" outfile output file\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:213
+#, c-format
+msgid ""
+"Very long (%u bytes) filename `%s' found.\n"
+" Please increase MAX_INPUT_NAMELEN in mkcramfs.c and recompile. Exiting.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:371
+msgid "filesystem too big. Exiting.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:422
+msgid ""
+"Exceeded MAXENTRIES. Raise this value in mkcramfs.c and recompile. "
+"Exiting.\n"
+msgstr ""
+
+#. (I don't think this can happen with zlib.)
+#: disk-utils/mkfs.cramfs.c:520
+#, c-format
+msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:537
+#, c-format
+msgid "%6.2f%% (%+d bytes)\t%s\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:705
+#, c-format
+msgid ""
+"warning: guestimate of required size (upper bound) is %LdMB, but maximum "
+"image size is %uMB. We might die prematurely.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:747
+#, fuzzy, c-format
+msgid "Including: %s\n"
+msgstr "identificador inválido: %s\n"
+
+#: disk-utils/mkfs.cramfs.c:753
+#, c-format
+msgid "Directory data: %d bytes\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:761
+#, c-format
+msgid "Everything: %d kilobytes\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:766
+#, fuzzy, c-format
+msgid "Super block: %d bytes\n"
+msgstr "espacio utilizado = %d bytes\n"
+
+#: disk-utils/mkfs.cramfs.c:773
+#, c-format
+msgid "CRC: %x\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:778
+#, c-format
+msgid "not enough space allocated for ROM image (%Ld allocated, %d used)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:790
+#, c-format
+msgid "ROM image write failed (%d %d)\n"
+msgstr ""
+
+#. (These warnings used to come at the start, but they scroll off the
+#. screen too quickly.)
+#. (can't happen when reading from ext2fs)
+#. bytes, not chars: think UTF8.
+#: disk-utils/mkfs.cramfs.c:799
+#, fuzzy
+msgid "warning: filenames truncated to 255 bytes.\n"
+msgstr "Atención: número de nodos-i demasiado elevado.\n"
+
+#: disk-utils/mkfs.cramfs.c:802
+msgid "warning: files were skipped due to errors.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:805
+#, c-format
+msgid "warning: file sizes truncated to %luMB (minus 1 byte).\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:810
+#, c-format
+msgid ""
+"warning: uids truncated to %u bits. (This may be a security concern.)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:815
+#, c-format
+msgid ""
+"warning: gids truncated to %u bits. (This may be a security concern.)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:820
+#, c-format
+msgid ""
+"WARNING: device numbers truncated to %u bits. This almost certainly means\n"
+"that some device files will be wrong.\n"
+msgstr ""
+
#: disk-utils/mkfs.minix.c:181
#, c-format
msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
@@ -887,7 +1117,7 @@ msgid "too many bad pages"
msgstr "Hay demasiadas páginas incorrectas"
#: disk-utils/mkswap.c:359 misc-utils/look.c:182 misc-utils/setterm.c:1130
-#: text-utils/more.c:2062 text-utils/more.c:2073
+#: text-utils/more.c:2063 text-utils/more.c:2074
msgid "Out of memory"
msgstr "No queda memoria"
@@ -955,9 +1185,9 @@ msgid "Unable to set up swap-space: unreadable"
msgstr "No se puede configurar el espacio de intercambio: no se puede leer"
#: disk-utils/mkswap.c:611
-#, fuzzy, c-format
+#, c-format
msgid "Setting up swapspace version %d, size = %lu KiB\n"
-msgstr "Configurando espacio de intercambio versión %d, tamaño = %lu bytes\n"
+msgstr "Configurando espacio de intercambio versión %d, tamaño = %lu KiB\n"
#: disk-utils/mkswap.c:617
msgid "unable to rewind swap-device"
@@ -974,7 +1204,7 @@ msgstr "fsync ha fallado"
#: disk-utils/setfdprm.c:31
#, c-format
msgid "Invalid number: %s\n"
-msgstr "Número no válido: %s\n"
+msgstr "Número inválido: %s\n"
#: disk-utils/setfdprm.c:81
#, c-format
@@ -1339,7 +1569,7 @@ msgstr " Lógica"
#. odd flag on end
#. type id
#. type name
-#: fdisk/cfdisk.c:1996 fdisk/fdisk.c:1306 fdisk/fdisk.c:1594
+#: fdisk/cfdisk.c:1996 fdisk/fdisk.c:1318 fdisk/fdisk.c:1606
#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:690 fdisk/sfdisk.c:581
msgid "Unknown"
msgstr "Desconocido"
@@ -1881,7 +2111,7 @@ msgstr ""
" el número de cabezas y el número de sectores por pista.\n"
"\n"
-#: fdisk/fdisk.c:194
+#: fdisk/fdisk.c:195
msgid ""
"Usage: fdisk [-b SSZ] [-u] DISK Change partition table\n"
" fdisk -l [-b SSZ] [-u] DISK List partition table(s)\n"
@@ -1902,7 +2132,7 @@ msgstr ""
"-u: Obtener Principio y Final en sectores (en lugar de cilindros)\n"
"-b 2048: (Para algunas unidades MO) Utilizar sectores de 2048 bytes\n"
-#: fdisk/fdisk.c:206
+#: fdisk/fdisk.c:207
msgid ""
"Usage: fdisk [-l] [-b SSZ] [-u] device\n"
"E.g.: fdisk /dev/hda (for the first IDE disk)\n"
@@ -1918,222 +2148,222 @@ msgstr ""
" o: fdisk /dev/rd/c0d0 o fdisk /dev/ida/c0d0 (para dispositivos RAID)\n"
" ...\n"
-#: fdisk/fdisk.c:215
+#: fdisk/fdisk.c:216
#, c-format
msgid "Unable to open %s\n"
msgstr "No se puede abrir %s\n"
-#: fdisk/fdisk.c:219
+#: fdisk/fdisk.c:220
#, c-format
msgid "Unable to read %s\n"
msgstr "No se puede leer %s\n"
-#: fdisk/fdisk.c:223
+#: fdisk/fdisk.c:224
#, c-format
msgid "Unable to seek on %s\n"
msgstr "No se puede buscar en %s\n"
-#: fdisk/fdisk.c:227
+#: fdisk/fdisk.c:228
#, c-format
msgid "Unable to write %s\n"
msgstr "No se puede escribir %s\n"
-#: fdisk/fdisk.c:231
+#: fdisk/fdisk.c:232
#, c-format
msgid "BLKGETSIZE ioctl failed on %s\n"
msgstr "ioctl BLKGETSIZE ha fallado en %s\n"
-#: fdisk/fdisk.c:235
+#: fdisk/fdisk.c:236
msgid "Unable to allocate any more memory\n"
msgstr "No se puede asignar más memoria\n"
-#: fdisk/fdisk.c:238
+#: fdisk/fdisk.c:239
msgid "Fatal error\n"
msgstr "Error muy grave\n"
-#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:359 fdisk/fdisk.c:366
-#: fdisk/fdisk.c:389 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:439
-#: fdisk/fdiskbsdlabel.c:124
+#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:360 fdisk/fdisk.c:367
+#: fdisk/fdisk.c:390 fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:440
+#: fdisk/fdiskbsdlabel.c:129
msgid "Command action"
msgstr "Orden Acción"
-#: fdisk/fdisk.c:323
+#: fdisk/fdisk.c:324
msgid " a toggle a read only flag"
msgstr " a Conmuta el indicador de sólo lectura"
#. sun
-#: fdisk/fdisk.c:324 fdisk/fdisk.c:368
+#: fdisk/fdisk.c:325 fdisk/fdisk.c:369
msgid " b edit bsd disklabel"
msgstr " b Modifica la etiqueta de disco bsd"
-#: fdisk/fdisk.c:325
+#: fdisk/fdisk.c:326
msgid " c toggle the mountable flag"
msgstr " c Conmuta indicador de montable"
#. sun
-#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:370
+#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:371
msgid " d delete a partition"
msgstr " d Suprime una partición"
-#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:371
+#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:372
msgid " l list known partition types"
msgstr " l Lista los tipos de particiones conocidos"
#. sun
-#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:360 fdisk/fdisk.c:372
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
-#: fdisk/fdiskbsdlabel.c:129
+#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:361 fdisk/fdisk.c:373
+#: fdisk/fdisk.c:398 fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
+#: fdisk/fdiskbsdlabel.c:134
msgid " m print this menu"
msgstr " m Imprime este menú"
-#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
+#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374
msgid " n add a new partition"
msgstr " n Añade una nueva partición"
-#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:361 fdisk/fdisk.c:374
+#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:362 fdisk/fdisk.c:375
msgid " o create a new empty DOS partition table"
msgstr " o Crea una nueva tabla de particiones DOS vacía"
-#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:375 fdisk/fdisk.c:398
-#: fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:376 fdisk/fdisk.c:399
+#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
msgid " p print the partition table"
msgstr " p Imprime la tabla de particiones"
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:362 fdisk/fdisk.c:376
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
-#: fdisk/fdiskbsdlabel.c:132
+#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:363 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:450
+#: fdisk/fdiskbsdlabel.c:137
msgid " q quit without saving changes"
msgstr " q Sale sin guardar los cambios"
-#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:363 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:364 fdisk/fdisk.c:378
msgid " s create a new empty Sun disklabel"
msgstr " s Crea una nueva etiqueta de disco Sun"
#. sun
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
msgid " t change a partition's system id"
msgstr " t Cambia el identificador de sistema de una partición"
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
msgid " u change display/entry units"
msgstr " u Cambia las unidades de visualización/entrada"
-#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380 fdisk/fdisk.c:402
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:452
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381 fdisk/fdisk.c:403
+#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
msgid " v verify the partition table"
msgstr " v Verifica la tabla de particiones"
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381 fdisk/fdisk.c:403
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:382 fdisk/fdisk.c:404
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
msgid " w write table to disk and exit"
msgstr " w Escribe la tabla en el disco y sale"
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:383
msgid " x extra functionality (experts only)"
msgstr " x Funciones adicionales (sólo para usuarios avanzados)"
-#: fdisk/fdisk.c:342
+#: fdisk/fdisk.c:343
msgid " a select bootable partition"
msgstr " a Selecciona partición iniciable"
#. sgi flavour
-#: fdisk/fdisk.c:343
+#: fdisk/fdisk.c:344
msgid " b edit bootfile entry"
msgstr " b Modifica entrada de fichero de inicio"
#. sgi
-#: fdisk/fdisk.c:344
+#: fdisk/fdisk.c:345
msgid " c select sgi swap partition"
msgstr " c Selecciona partición de intercambio sgi"
-#: fdisk/fdisk.c:367
+#: fdisk/fdisk.c:368
msgid " a toggle a bootable flag"
msgstr " a Conmuta el indicador de iniciable"
-#: fdisk/fdisk.c:369
+#: fdisk/fdisk.c:370
msgid " c toggle the dos compatibility flag"
msgstr " c Conmuta el indicador de compatibilidad con DOS"
-#: fdisk/fdisk.c:390
+#: fdisk/fdisk.c:391
msgid " a change number of alternate cylinders"
msgstr " a Cambia el número de cilindros alternativos"
#. sun
-#: fdisk/fdisk.c:391 fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:441
+#: fdisk/fdisk.c:392 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
msgid " c change number of cylinders"
msgstr " c Cambia el número de cilindros"
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:393 fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:443
msgid " d print the raw data in the partition table"
msgstr " d Imprime los datos en bruto de la tabla de particiones"
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:394
msgid " e change number of extra sectors per cylinder"
msgstr " e Cambia el número de sectores adicionales por cilindro"
#. sun
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:395 fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
msgid " h change number of heads"
msgstr " h Cambia el número de cabezas"
-#: fdisk/fdisk.c:395
+#: fdisk/fdisk.c:396
msgid " i change interleave factor"
msgstr " i Cambia el factor de interleave"
#. sun
-#: fdisk/fdisk.c:396
+#: fdisk/fdisk.c:397
msgid " o change rotation speed (rpm)"
msgstr " o Cambia la velocidad de rotación (r.p.m.)"
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:450
-#: fdisk/fdiskbsdlabel.c:133
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:451
+#: fdisk/fdiskbsdlabel.c:138
msgid " r return to main menu"
msgstr " r Vuelve al menú principal"
-#: fdisk/fdisk.c:401 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:452
msgid " s change number of sectors/track"
msgstr " s Cambia el número de sectores por pista"
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:405
msgid " y change number of physical cylinders"
msgstr " y Cambia el número de cilindros físicos"
-#: fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:440
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:441
msgid " b move beginning of data in a partition"
msgstr " b Mueve el principio de los datos de una partición"
-#: fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:443
+#: fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:444
msgid " e list extended partitions"
msgstr " e Lista las particiones extendidas"
#. !sun
-#: fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
msgid " g create an IRIX (SGI) partition table"
msgstr " g Crea una tabla de particiones IRIX (SGI)"
#. !sun
-#: fdisk/fdisk.c:444
+#: fdisk/fdisk.c:445
msgid " f fix partition order"
msgstr " f Corrige el orden de las particiones"
-#: fdisk/fdisk.c:561
+#: fdisk/fdisk.c:562
msgid "You must set"
msgstr "Debe establecer"
-#: fdisk/fdisk.c:575
+#: fdisk/fdisk.c:576
msgid "heads"
msgstr "cabezas"
-#: fdisk/fdisk.c:577 fdisk/fdisk.c:1142 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:578 fdisk/fdisk.c:1154 fdisk/sfdisk.c:864
msgid "sectors"
msgstr "sectores"
-#: fdisk/fdisk.c:579 fdisk/fdisk.c:1142 fdisk/fdiskbsdlabel.c:464
+#: fdisk/fdisk.c:580 fdisk/fdisk.c:1154 fdisk/fdiskbsdlabel.c:469
#: fdisk/sfdisk.c:864
msgid "cylinders"
msgstr "cilindros"
-#: fdisk/fdisk.c:583
+#: fdisk/fdisk.c:584
#, c-format
msgid ""
"%s%s.\n"
@@ -2142,11 +2372,11 @@ msgstr ""
"%s%s.\n"
"Puede efectuar esta operación desde el menú de funciones adicionales.\n"
-#: fdisk/fdisk.c:584
+#: fdisk/fdisk.c:585
msgid " and "
msgstr " y "
-#: fdisk/fdisk.c:601
+#: fdisk/fdisk.c:602
#, c-format
msgid ""
"\n"
@@ -2165,28 +2395,28 @@ msgstr ""
"2) software de arranque o particionamiento de otros sistemas operativos\n"
" (p.ej. FDISK de DOS, FDISK de OS/2)\n"
-#: fdisk/fdisk.c:624
+#: fdisk/fdisk.c:625
msgid "Bad offset in primary extended partition\n"
msgstr "Desplazamiento incorrecto en particiones extendidas primarias\n"
-#: fdisk/fdisk.c:638
+#: fdisk/fdisk.c:639
#, c-format
msgid "Warning: deleting partitions after %d\n"
msgstr "Atención: se están suprimiendo las particiones después de %d\n"
-#: fdisk/fdisk.c:655
+#: fdisk/fdisk.c:656
#, c-format
msgid "Warning: extra link pointer in partition table %d\n"
msgstr "Atención: puntero de enlace adicional en tabla de particiones %d\n"
-#: fdisk/fdisk.c:663
+#: fdisk/fdisk.c:664
#, c-format
msgid "Warning: ignoring extra data in partition table %d\n"
msgstr ""
"Atención: no se tienen en cuenta los datos adicionales de la tabla de "
"particiones %d\n"
-#: fdisk/fdisk.c:708
+#: fdisk/fdisk.c:709
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"
@@ -2198,16 +2428,22 @@ msgstr ""
"operación, el contenido anterior no se podrá recuperar.\n"
"\n"
-#: fdisk/fdisk.c:752
+#: fdisk/fdisk.c:753
#, c-format
msgid "Note: sector size is %d (not %d)\n"
msgstr "Nota: el tamaño del sector es %d (no %d)\n"
-#: fdisk/fdisk.c:870
+#: fdisk/fdisk.c:883
msgid "You will not be able to write the partition table.\n"
msgstr "No podrá escribir la tabla de particiones.\n"
-#: fdisk/fdisk.c:903
+#: fdisk/fdisk.c:914
+msgid ""
+"This disk has both DOS and BSD magic.\n"
+"Give the 'b' command to go to BSD mode.\n"
+msgstr ""
+
+#: fdisk/fdisk.c:924
msgid ""
"Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
"disklabel\n"
@@ -2215,25 +2451,25 @@ msgstr ""
"El dispositivo no contiene una tabla de particiones DOS válida ni una "
"etiqueta de disco Sun o SGI o OSF\n"
-#: fdisk/fdisk.c:920
+#: fdisk/fdisk.c:942
msgid "Internal error\n"
msgstr "Error interno\n"
-#: fdisk/fdisk.c:942
+#: fdisk/fdisk.c:954
#, c-format
msgid "Ignoring extra extended partition %d\n"
msgstr "No se tiene en cuenta la partición extendida adicional %d\n"
-#: fdisk/fdisk.c:954
+#: fdisk/fdisk.c:966
#, c-format
msgid ""
"Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
"(rite)\n"
msgstr ""
-"Atención: el indicador 0x%04x no válido de la tabla de particiones %d se "
+"Atención: el indicador 0x%04x inválido de la tabla de particiones %d se "
"corregirá mediante w(rite)\n"
-#: fdisk/fdisk.c:976
+#: fdisk/fdisk.c:988
msgid ""
"\n"
"got EOF thrice - exiting..\n"
@@ -2241,65 +2477,65 @@ msgstr ""
"\n"
"se ha detectado EOF tres veces - saliendo...\n"
-#: fdisk/fdisk.c:1015
+#: fdisk/fdisk.c:1027
msgid "Hex code (type L to list codes): "
msgstr "Código hexadecimal (escriba L para ver los códigos): "
-#: fdisk/fdisk.c:1054
+#: fdisk/fdisk.c:1066
#, c-format
msgid "%s (%d-%d, default %d): "
msgstr "%s (%d-%d, valor predeterminado %d): "
-#: fdisk/fdisk.c:1110
+#: fdisk/fdisk.c:1122
#, c-format
msgid "Using default value %d\n"
msgstr "Se está utilizando el valor predeterminado %d\n"
-#: fdisk/fdisk.c:1114
+#: fdisk/fdisk.c:1126
msgid "Value out of range.\n"
msgstr "El valor está fuera del rango.\n"
-#: fdisk/fdisk.c:1124
+#: fdisk/fdisk.c:1136
msgid "Partition number"
msgstr "Número de partición"
-#: fdisk/fdisk.c:1133
+#: fdisk/fdisk.c:1145
#, c-format
msgid "Warning: partition %d has empty type\n"
msgstr "Atención: la partición %d es de tipo vacío\n"
-#: fdisk/fdisk.c:1140
+#: fdisk/fdisk.c:1152
msgid "cylinder"
msgstr "cilindro"
-#: fdisk/fdisk.c:1140
+#: fdisk/fdisk.c:1152
msgid "sector"
msgstr "sector"
-#: fdisk/fdisk.c:1149
+#: fdisk/fdisk.c:1161
#, c-format
msgid "Changing display/entry units to %s\n"
msgstr "Se cambian las unidades de visualización/entrada a %s\n"
-#: fdisk/fdisk.c:1160
+#: fdisk/fdisk.c:1172
#, c-format
msgid "WARNING: Partition %d is an extended partition\n"
msgstr "ATENCIÓN: la partición %d es una partición extendida\n"
-#: fdisk/fdisk.c:1171
+#: fdisk/fdisk.c:1183
msgid "DOS Compatibility flag is set\n"
msgstr "El indicador de compatibilidad con DOS está establecido\n"
-#: fdisk/fdisk.c:1175
+#: fdisk/fdisk.c:1187
msgid "DOS Compatibility flag is not set\n"
msgstr "El indicador de compatibilidad con DOS no está establecido\n"
-#: fdisk/fdisk.c:1261
+#: fdisk/fdisk.c:1273
#, c-format
msgid "Partition %d does not exist yet!\n"
msgstr "La partición %d todavía no existe\n"
-#: fdisk/fdisk.c:1266
+#: fdisk/fdisk.c:1278
msgid ""
"Type 0 means free space to many systems\n"
"(but not to Linux). Having partitions of\n"
@@ -2311,7 +2547,7 @@ msgstr ""
"tener particiones de tipo 0. Puede suprimir una\n"
"partición con la orden `d'.\n"
-#: fdisk/fdisk.c:1275
+#: fdisk/fdisk.c:1287
msgid ""
"You cannot change a partition into an extended one or vice versa\n"
"Delete it first.\n"
@@ -2319,7 +2555,7 @@ msgstr ""
"No puede convertir una partición en extendida ni viceversa.\n"
"Primero debe suprimirla.\n"
-#: fdisk/fdisk.c:1284
+#: fdisk/fdisk.c:1296
msgid ""
"Consider leaving partition 3 as Whole disk (5),\n"
"as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2329,7 +2565,7 @@ msgstr ""
"ya que así lo prevé SunOS/Solaris e incluso es adecuado para Linux.\n"
"\n"
-#: fdisk/fdisk.c:1290
+#: fdisk/fdisk.c:1302
msgid ""
"Consider leaving partition 9 as volume header (0),\n"
"and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2339,53 +2575,53 @@ msgstr ""
"y la partición 11 como volumen completo (6) ya que IRIX así lo espera.\n"
"\n"
-#: fdisk/fdisk.c:1303
+#: fdisk/fdisk.c:1315
#, c-format
msgid "Changed system type of partition %d to %x (%s)\n"
msgstr "Se ha cambiado el tipo de sistema de la partición %d por %x (%s)\n"
-#: fdisk/fdisk.c:1357
+#: fdisk/fdisk.c:1369
#, c-format
msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
msgstr ""
"La partición %d tiene distintos principios físicos/lógicos (¿no Linux?):\n"
-#: fdisk/fdisk.c:1359 fdisk/fdisk.c:1367 fdisk/fdisk.c:1376 fdisk/fdisk.c:1385
+#: fdisk/fdisk.c:1371 fdisk/fdisk.c:1379 fdisk/fdisk.c:1388 fdisk/fdisk.c:1397
#, c-format
msgid " phys=(%d, %d, %d) "
msgstr " físicos=(%d, %d, %d) "
-#: fdisk/fdisk.c:1360 fdisk/fdisk.c:1368
+#: fdisk/fdisk.c:1372 fdisk/fdisk.c:1380
#, c-format
msgid "logical=(%d, %d, %d)\n"
msgstr "lógicos=(%d, %d, %d)\n"
-#: fdisk/fdisk.c:1365
+#: fdisk/fdisk.c:1377
#, c-format
msgid "Partition %d has different physical/logical endings:\n"
msgstr "La partición %d tiene distintos finales físicos/lógicos:\n"
-#: fdisk/fdisk.c:1374
+#: fdisk/fdisk.c:1386
#, c-format
msgid "Partition %i does not start on cylinder boundary:\n"
msgstr "La partición %i no empieza en el límite del cilindro:\n"
-#: fdisk/fdisk.c:1377
+#: fdisk/fdisk.c:1389
#, c-format
msgid "should be (%d, %d, 1)\n"
msgstr "debe ser (%d, %d, 1)\n"
-#: fdisk/fdisk.c:1383
+#: fdisk/fdisk.c:1395
#, c-format
msgid "Partition %i does not end on cylinder boundary:\n"
msgstr "La partición %i no termina en el límite del cilindro:\n"
-#: fdisk/fdisk.c:1386
+#: fdisk/fdisk.c:1398
#, c-format
msgid "should be (%d, %d, %d)\n"
msgstr "debe ser (%d, %d, %d)\n"
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1405
#, c-format
msgid ""
"\n"
@@ -2398,7 +2634,7 @@ msgstr ""
"Unidades = %s de %d * %d bytes\n"
"\n"
-#: fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1513
msgid ""
"Nothing to do. Ordering is correct already.\n"
"\n"
@@ -2406,17 +2642,17 @@ msgstr ""
"No hay nada que hacer. El orden ya es correcto.\n"
"\n"
-#: fdisk/fdisk.c:1565
+#: fdisk/fdisk.c:1577
#, c-format
msgid "%*s Boot Start End Blocks Id System\n"
msgstr "%*s Inicio Principio Fin Bloques Id Sistema\n"
# Nota: si se pone Dispositivo no queda bien el resto de la línea.
-#: fdisk/fdisk.c:1566 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:675
+#: fdisk/fdisk.c:1578 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:675
msgid "Device"
msgstr "Disposit."
-#: fdisk/fdisk.c:1603
+#: fdisk/fdisk.c:1615
msgid ""
"\n"
"Partition table entries are not in disk order\n"
@@ -2424,7 +2660,7 @@ msgstr ""
"\n"
"Las entradas de la tabla de particiones no están en el orden del disco\n"
-#: fdisk/fdisk.c:1613
+#: fdisk/fdisk.c:1625
#, c-format
msgid ""
"\n"
@@ -2435,92 +2671,92 @@ msgstr ""
"Disco %s: %d cabezas, %d sectores, %d cilindros\n"
"\n"
-#: fdisk/fdisk.c:1615
+#: fdisk/fdisk.c:1627
msgid "Nr AF Hd Sec Cyl Hd Sec Cyl Start Size ID\n"
msgstr "Nº IA Cab Sect Cil Cab Sect Cil Inicio Tamaño ID\n"
-#: fdisk/fdisk.c:1659
+#: fdisk/fdisk.c:1671
#, c-format
msgid "Warning: partition %d contains sector 0\n"
msgstr "Atención: la partición %d contiene el sector 0\n"
-#: fdisk/fdisk.c:1662
+#: fdisk/fdisk.c:1674
#, c-format
msgid "Partition %d: head %d greater than maximum %d\n"
msgstr "Partición %d: el cabeza %d supera el máximo %d\n"
-#: fdisk/fdisk.c:1665
+#: fdisk/fdisk.c:1677
#, c-format
msgid "Partition %d: sector %d greater than maximum %d\n"
msgstr "Partición %d: el sector %d supera el máximo %d\n"
-#: fdisk/fdisk.c:1668
+#: fdisk/fdisk.c:1680
#, c-format
msgid "Partitions %d: cylinder %d greater than maximum %d\n"
msgstr "Partición %d: el cilindro %d supera el máximo %d\n"
-#: fdisk/fdisk.c:1672
+#: fdisk/fdisk.c:1684
#, c-format
msgid "Partition %d: previous sectors %d disagrees with total %d\n"
msgstr "Partición %d: sectores anteriores %d no concuerdan con total %d\n"
-#: fdisk/fdisk.c:1704
+#: fdisk/fdisk.c:1716
#, c-format
msgid "Warning: bad start-of-data in partition %d\n"
msgstr "Atención: inicio de datos incorrecto en partición %d\n"
-#: fdisk/fdisk.c:1712
+#: fdisk/fdisk.c:1724
#, c-format
msgid "Warning: partition %d overlaps partition %d.\n"
msgstr "Atención: la partición %d se solapa con la partición %d.\n"
-#: fdisk/fdisk.c:1732
+#: fdisk/fdisk.c:1744
#, c-format
msgid "Warning: partition %d is empty\n"
msgstr "Atención: la partición %d está vacía\n"
-#: fdisk/fdisk.c:1737
+#: fdisk/fdisk.c:1749
#, c-format
msgid "Logical partition %d not entirely in partition %d\n"
msgstr "La partición lógica %d no está por completo en la partición %d\n"
-#: fdisk/fdisk.c:1743
+#: fdisk/fdisk.c:1755
#, c-format
msgid "Total allocated sectors %d greater than the maximum %d\n"
msgstr "El total de sectores asignados %d supera el máximo %d\n"
-#: fdisk/fdisk.c:1746
+#: fdisk/fdisk.c:1758
#, c-format
msgid "%d unallocated sectors\n"
msgstr "%d sectores no asignados\n"
-#: fdisk/fdisk.c:1759 fdisk/fdisksgilabel.c:661 fdisk/fdisksunlabel.c:505
+#: fdisk/fdisk.c:1771 fdisk/fdisksgilabel.c:661 fdisk/fdisksunlabel.c:505
#, c-format
msgid "Partition %d is already defined. Delete it before re-adding it.\n"
msgstr ""
"La partición %d ya está definida. Suprímala antes de volver a añadirla.\n"
-#: fdisk/fdisk.c:1780 fdisk/fdiskbsdlabel.c:279 fdisk/fdisksgilabel.c:683
+#: fdisk/fdisk.c:1792 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:683
#: fdisk/fdisksunlabel.c:520
#, c-format
msgid "First %s"
msgstr "Primer %s"
-#: fdisk/fdisk.c:1795 fdisk/fdisksunlabel.c:561
+#: fdisk/fdisk.c:1807 fdisk/fdisksunlabel.c:561
#, c-format
msgid "Sector %d is already allocated\n"
msgstr "El sector %d ya está asignado\n"
-#: fdisk/fdisk.c:1831
+#: fdisk/fdisk.c:1843
msgid "No free sectors available\n"
msgstr "No hay disponible ningún sector libre\n"
-#: fdisk/fdisk.c:1840 fdisk/fdiskbsdlabel.c:286 fdisk/fdisksunlabel.c:572
+#: fdisk/fdisk.c:1852 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:572
#, c-format
msgid "Last %s or +size or +sizeM or +sizeK"
msgstr "Último %s o +tamaño o +tamañoM o +tamañoK"
-#: fdisk/fdisk.c:1905
+#: fdisk/fdisk.c:1917
msgid ""
"\tSorry - this fdisk cannot handle AIX disk labels.\n"
"\tIf you want to add DOS-type partitions, create\n"
@@ -2532,16 +2768,16 @@ msgstr ""
" tabla de particiones DOS vacía primero. (Use o.)\n"
" ATENCIÓN: Esto destruirá el contenido de este disco.\n"
-#: fdisk/fdisk.c:1914 fdisk/fdiskbsdlabel.c:613
+#: fdisk/fdisk.c:1926 fdisk/fdiskbsdlabel.c:617
msgid "The maximum number of partitions has been created\n"
msgstr "Se ha creado el número máximo de particiones\n"
-#: fdisk/fdisk.c:1924
+#: fdisk/fdisk.c:1936
msgid "You must delete some partition and add an extended partition first\n"
msgstr ""
"Primero debe suprimir alguna partición y añadir una partición extendida\n"
-#: fdisk/fdisk.c:1929
+#: fdisk/fdisk.c:1941
#, c-format
msgid ""
"Command action\n"
@@ -2552,32 +2788,32 @@ msgstr ""
"%s\n"
" p Partición primaria (1-4)\n"
-#: fdisk/fdisk.c:1931
+#: fdisk/fdisk.c:1943
msgid "l logical (5 or over)"
msgstr "l Partición lógica (5 o superior)"
-#: fdisk/fdisk.c:1931
+#: fdisk/fdisk.c:1943
msgid "e extended"
msgstr "e Partición extendida"
-#: fdisk/fdisk.c:1948
+#: fdisk/fdisk.c:1960
#, c-format
msgid "Invalid partition number for type `%c'\n"
-msgstr "Número de partición no válido para el tipo `%c'\n"
+msgstr "Número de partición inválido para el tipo `%c'\n"
-#: fdisk/fdisk.c:1984
+#: fdisk/fdisk.c:1996
msgid ""
"The partition table has been altered!\n"
"\n"
msgstr ""
-"Ya se ha modificado la tabla de particiones\n"
+"¡Se ha modificado la tabla de particiones!\n"
"\n"
-#: fdisk/fdisk.c:1993
+#: fdisk/fdisk.c:2005
msgid "Calling ioctl() to re-read partition table.\n"
msgstr "Llamando a ioctl() para volver a leer la tabla de particiones.\n"
-#: fdisk/fdisk.c:2009
+#: fdisk/fdisk.c:2021
#, c-format
msgid ""
"\n"
@@ -2591,7 +2827,7 @@ msgstr ""
"El núcleo todavía usa la tabla antigua.\n"
"La nueva tabla se usará en el próximo reinicio.\n"
-#: fdisk/fdisk.c:2019
+#: fdisk/fdisk.c:2031
msgid ""
"\n"
"WARNING: If you have created or modified any DOS 6.x\n"
@@ -2603,68 +2839,68 @@ msgstr ""
"particiones DOS 6.x, consulte la página man de fdisk\n"
"para ver información adicional.\n"
-#: fdisk/fdisk.c:2026
+#: fdisk/fdisk.c:2038
msgid "Syncing disks.\n"
msgstr "Se están sincronizando los discos.\n"
-#: fdisk/fdisk.c:2073
+#: fdisk/fdisk.c:2085
#, c-format
msgid "Partition %d has no data area\n"
msgstr "La partición %d no tiene ninguna área de datos\n"
-#: fdisk/fdisk.c:2078
+#: fdisk/fdisk.c:2090
msgid "New beginning of data"
msgstr "Nuevo principio de datos"
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2106
msgid "Expert command (m for help): "
msgstr "Orden avanzada (m para obtener ayuda): "
-#: fdisk/fdisk.c:2107
+#: fdisk/fdisk.c:2119
msgid "Number of cylinders"
msgstr "Número de cilindros"
-#: fdisk/fdisk.c:2134
+#: fdisk/fdisk.c:2146
msgid "Number of heads"
msgstr "Número de cabezas"
-#: fdisk/fdisk.c:2159
+#: fdisk/fdisk.c:2171
msgid "Number of sectors"
msgstr "Número de sectores"
-#: fdisk/fdisk.c:2162
+#: fdisk/fdisk.c:2174
msgid "Warning: setting sector offset for DOS compatiblity\n"
msgstr ""
"Atención: estableciendo desplazamiento de sector para compatibilidad con "
"DOS\n"
-#: fdisk/fdisk.c:2237
+#: fdisk/fdisk.c:2249
#, c-format
msgid "Disk %s doesn't contain a valid partition table\n"
msgstr "El disco %s no contiene una tabla de particiones válida\n"
-#: fdisk/fdisk.c:2251
+#: fdisk/fdisk.c:2263
#, c-format
msgid "Cannot open %s\n"
msgstr "No se puede abrir %s\n"
-#: fdisk/fdisk.c:2267 fdisk/sfdisk.c:2363
+#: fdisk/fdisk.c:2279 fdisk/sfdisk.c:2363
#, c-format
msgid "cannot open %s\n"
msgstr "No se puede abrir %s\n"
-#: fdisk/fdisk.c:2289
+#: fdisk/fdisk.c:2301
#, c-format
msgid "%c: unknown command\n"
msgstr "%c: orden desconocida\n"
-#: fdisk/fdisk.c:2339
+#: fdisk/fdisk.c:2351
msgid "This kernel finds the sector size itself - -b option ignored\n"
msgstr ""
"Este núcleo encuentra el tamaño del sector por sí mismo; no se tiene en "
"cuenta la opción -b\n"
-#: fdisk/fdisk.c:2342
+#: fdisk/fdisk.c:2355
msgid ""
"Warning: the -b (set sector size) option should be used with one specified "
"device\n"
@@ -2672,21 +2908,20 @@ msgstr ""
"Atención: la opción -b (establecer tamaño de sector) debe utilizarse con un "
"dispositivo especificado\n"
-#: fdisk/fdisk.c:2405
-#, c-format
-msgid ""
-"Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
-"To return to DOS partition table mode, use the 'r' command.\n"
+#. OSF label, and no DOS label
+#: fdisk/fdisk.c:2414
+#, fuzzy, c-format
+msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
msgstr ""
"Se ha detectado una etiqueta de disco OSF/1 en %s, entrando en el modo de\n"
"etiqueta de disco. Para volver al modo de tabla de particiones DOS, use\n"
"la orden 'r'.\n"
-#: fdisk/fdisk.c:2413
+#: fdisk/fdisk.c:2424
msgid "Command (m for help): "
msgstr "Orden (m para obtener ayuda): "
-#: fdisk/fdisk.c:2429
+#: fdisk/fdisk.c:2440
#, c-format
msgid ""
"\n"
@@ -2695,15 +2930,15 @@ msgstr ""
"\n"
"El fichero de inicio actual es: %s\n"
-#: fdisk/fdisk.c:2431
+#: fdisk/fdisk.c:2442
msgid "Please enter the name of the new boot file: "
msgstr "Escriba el nombre del nuevo fichero de inicio: "
-#: fdisk/fdisk.c:2433
+#: fdisk/fdisk.c:2444
msgid "Boot file unchanged\n"
msgstr "No se ha modificado el fichero de inicio\n"
-#: fdisk/fdisk.c:2497
+#: fdisk/fdisk.c:2508
msgid ""
"\n"
"\tSorry, no experts menu for SGI partition tables available.\n"
@@ -2741,7 +2976,7 @@ msgstr ""
"\t el disco lógicamente de la máquina AIX.\n"
"\t (O se tendrá que convertir en un AIXperto)."
-#: fdisk/fdiskbsdlabel.c:117
+#: fdisk/fdiskbsdlabel.c:122
#, c-format
msgid ""
"\n"
@@ -2750,168 +2985,168 @@ msgstr ""
"\n"
"Etiqueta BSD para el dispositivo: %s\n"
-#: fdisk/fdiskbsdlabel.c:125
+#: fdisk/fdiskbsdlabel.c:130
msgid " d delete a BSD partition"
msgstr " d Suprime una partición BSD"
-#: fdisk/fdiskbsdlabel.c:126
+#: fdisk/fdiskbsdlabel.c:131
msgid " e edit drive data"
msgstr " e Modifica los datos de la unidad"
-#: fdisk/fdiskbsdlabel.c:127
+#: fdisk/fdiskbsdlabel.c:132
msgid " i install bootstrap"
msgstr " i Instala secuencia de inicio"
-#: fdisk/fdiskbsdlabel.c:128
+#: fdisk/fdiskbsdlabel.c:133
msgid " l list known filesystem types"
msgstr " l Lista los tipos de sistemas de ficheros conocidos"
-#: fdisk/fdiskbsdlabel.c:130
+#: fdisk/fdiskbsdlabel.c:135
msgid " n add a new BSD partition"
msgstr " n Añade una nueva partición BSD"
-#: fdisk/fdiskbsdlabel.c:131
+#: fdisk/fdiskbsdlabel.c:136
msgid " p print BSD partition table"
msgstr " p Imprime la tabla de particiones BSD"
-#: fdisk/fdiskbsdlabel.c:134
+#: fdisk/fdiskbsdlabel.c:139
msgid " s show complete disklabel"
msgstr " s Muestra la etiqueta del disco completa"
-#: fdisk/fdiskbsdlabel.c:135
+#: fdisk/fdiskbsdlabel.c:140
msgid " t change a partition's filesystem id"
msgstr ""
" t Cambia el identificador del sistema de ficheros de una partición"
-#: fdisk/fdiskbsdlabel.c:136
+#: fdisk/fdiskbsdlabel.c:141
msgid " u change units (cylinders/sectors)"
msgstr " u Cambia las unidades (cilindros/sectores)"
-#: fdisk/fdiskbsdlabel.c:137
+#: fdisk/fdiskbsdlabel.c:142
msgid " w write disklabel to disk"
msgstr " w Escribe la etiqueta de disco en el disco"
-#: fdisk/fdiskbsdlabel.c:139
+#: fdisk/fdiskbsdlabel.c:144
msgid " x link BSD partition to non-BSD partition"
msgstr " x Enlaza la partición BSD con una partición no BSD"
-#: fdisk/fdiskbsdlabel.c:171
+#: fdisk/fdiskbsdlabel.c:176
#, c-format
msgid "Partition %s has invalid starting sector 0.\n"
-msgstr "La partición %s tiene un sector 0 de inicio no válido.\n"
+msgstr "La partición %s tiene un sector 0 de inicio inválido.\n"
-#: fdisk/fdiskbsdlabel.c:175
+#: fdisk/fdiskbsdlabel.c:180
#, c-format
msgid "Reading disklabel of %s at sector %d.\n"
msgstr "Leyendo etiqueta de disco de %s en sector %d.\n"
-#: fdisk/fdiskbsdlabel.c:185
+#: fdisk/fdiskbsdlabel.c:190
#, c-format
msgid "There is no *BSD partition on %s.\n"
msgstr "No hay ninguna partición *BSD en %s.\n"
-#: fdisk/fdiskbsdlabel.c:199
+#: fdisk/fdiskbsdlabel.c:204
msgid "BSD disklabel command (m for help): "
msgstr "Orden de etiqueta de disco BSD (m para obtener ayuda): "
-#: fdisk/fdiskbsdlabel.c:313
+#: fdisk/fdiskbsdlabel.c:318
#, c-format
msgid "type: %s\n"
msgstr "tipo: %s\n"
-#: fdisk/fdiskbsdlabel.c:315
+#: fdisk/fdiskbsdlabel.c:320
#, c-format
msgid "type: %d\n"
msgstr "tipo: %d\n"
-#: fdisk/fdiskbsdlabel.c:316
+#: fdisk/fdiskbsdlabel.c:321
#, c-format
msgid "disk: %.*s\n"
msgstr "disco: %.*s\n"
-#: fdisk/fdiskbsdlabel.c:317
+#: fdisk/fdiskbsdlabel.c:322
#, c-format
msgid "label: %.*s\n"
msgstr "etiqueta: %.*s\n"
-#: fdisk/fdiskbsdlabel.c:318
+#: fdisk/fdiskbsdlabel.c:323
msgid "flags:"
msgstr "indicadores:"
-#: fdisk/fdiskbsdlabel.c:320
+#: fdisk/fdiskbsdlabel.c:325
msgid " removable"
msgstr " removable"
-#: fdisk/fdiskbsdlabel.c:322
+#: fdisk/fdiskbsdlabel.c:327
msgid " ecc"
msgstr " ecc"
-#: fdisk/fdiskbsdlabel.c:324
+#: fdisk/fdiskbsdlabel.c:329
msgid " badsect"
msgstr " badsect"
#. On various machines the fields of *lp are short/int/long
#. In order to avoid problems, we cast them all to long.
-#: fdisk/fdiskbsdlabel.c:328
+#: fdisk/fdiskbsdlabel.c:333
#, c-format
msgid "bytes/sector: %ld\n"
msgstr "bytes por sector: %ld\n"
-#: fdisk/fdiskbsdlabel.c:329
+#: fdisk/fdiskbsdlabel.c:334
#, c-format
msgid "sectors/track: %ld\n"
msgstr "sectores por pista: %ld\n"
-#: fdisk/fdiskbsdlabel.c:330
+#: fdisk/fdiskbsdlabel.c:335
#, c-format
msgid "tracks/cylinder: %ld\n"
msgstr "pistas por cilindro: %ld\n"
-#: fdisk/fdiskbsdlabel.c:331
+#: fdisk/fdiskbsdlabel.c:336
#, c-format
msgid "sectors/cylinder: %ld\n"
msgstr "sectores por cilindro: %ld\n"
-#: fdisk/fdiskbsdlabel.c:332
+#: fdisk/fdiskbsdlabel.c:337
#, c-format
msgid "cylinders: %ld\n"
msgstr "cilindros: %ld\n"
-#: fdisk/fdiskbsdlabel.c:333
+#: fdisk/fdiskbsdlabel.c:338
#, c-format
msgid "rpm: %d\n"
msgstr "r.p.m.: %d\n"
-#: fdisk/fdiskbsdlabel.c:334
+#: fdisk/fdiskbsdlabel.c:339
#, c-format
msgid "interleave: %d\n"
msgstr "interleave: %d\n"
-#: fdisk/fdiskbsdlabel.c:335
+#: fdisk/fdiskbsdlabel.c:340
#, c-format
msgid "trackskew: %d\n"
msgstr "trackskew: %d\n"
-#: fdisk/fdiskbsdlabel.c:336
+#: fdisk/fdiskbsdlabel.c:341
#, c-format
msgid "cylinderskew: %d\n"
msgstr "cylinderskew: %d\n"
-#: fdisk/fdiskbsdlabel.c:337
+#: fdisk/fdiskbsdlabel.c:342
#, c-format
msgid "headswitch: %ld\t\t# milliseconds\n"
msgstr "headswitch: %ld\t\t# milisegundos\n"
-#: fdisk/fdiskbsdlabel.c:339
+#: fdisk/fdiskbsdlabel.c:344
#, c-format
msgid "track-to-track seek: %ld\t# milliseconds\n"
msgstr "búsqueda pista a pista: %ld\t# milisegundos\n"
-#: fdisk/fdiskbsdlabel.c:341
+#: fdisk/fdiskbsdlabel.c:346
msgid "drivedata: "
msgstr "drivedata: "
-#: fdisk/fdiskbsdlabel.c:350
+#: fdisk/fdiskbsdlabel.c:355
#, c-format
msgid ""
"\n"
@@ -2920,97 +3155,97 @@ msgstr ""
"\n"
"%d particiones:\n"
-#: fdisk/fdiskbsdlabel.c:351
+#: fdisk/fdiskbsdlabel.c:356
msgid "# start end size fstype [fsize bsize cpg]\n"
msgstr "# comienzo final tamaño sficheros [tamf tamb cpg]\n"
-#: fdisk/fdiskbsdlabel.c:400 fdisk/fdiskbsdlabel.c:403
+#: fdisk/fdiskbsdlabel.c:405 fdisk/fdiskbsdlabel.c:408
#, c-format
msgid "Writing disklabel to %s.\n"
msgstr "Escribiendo etiqueta de disco en %s.\n"
-#: fdisk/fdiskbsdlabel.c:415 fdisk/fdiskbsdlabel.c:417
+#: fdisk/fdiskbsdlabel.c:420 fdisk/fdiskbsdlabel.c:422
#, c-format
msgid "%s contains no disklabel.\n"
msgstr "%s no contiene ninguna etiqueta de disco.\n"
-#: fdisk/fdiskbsdlabel.c:422
+#: fdisk/fdiskbsdlabel.c:427
msgid "Do you want to create a disklabel? (y/n) "
msgstr "¿Desea crear una etiqueta de disco? (y/n) "
-#: fdisk/fdiskbsdlabel.c:461
+#: fdisk/fdiskbsdlabel.c:466
msgid "bytes/sector"
msgstr "bytes/sector"
-#: fdisk/fdiskbsdlabel.c:462
+#: fdisk/fdiskbsdlabel.c:467
msgid "sectors/track"
msgstr "sectores/pista"
-#: fdisk/fdiskbsdlabel.c:463
+#: fdisk/fdiskbsdlabel.c:468
msgid "tracks/cylinder"
msgstr "pistas/cilindro"
-#: fdisk/fdiskbsdlabel.c:471
+#: fdisk/fdiskbsdlabel.c:476
msgid "sectors/cylinder"
msgstr "sectores/cilindro"
-#: fdisk/fdiskbsdlabel.c:475
+#: fdisk/fdiskbsdlabel.c:480
msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
msgstr "Debe ser <= sectores/pista * pistas/cilindro (valor predeterminado).\n"
-#: fdisk/fdiskbsdlabel.c:477
+#: fdisk/fdiskbsdlabel.c:482
msgid "rpm"
msgstr "r.p.m."
-#: fdisk/fdiskbsdlabel.c:478
+#: fdisk/fdiskbsdlabel.c:483
msgid "interleave"
msgstr "interleave"
-#: fdisk/fdiskbsdlabel.c:479
+#: fdisk/fdiskbsdlabel.c:484
msgid "trackskew"
msgstr "trackskew"
-#: fdisk/fdiskbsdlabel.c:480
+#: fdisk/fdiskbsdlabel.c:485
msgid "cylinderskew"
msgstr "cylinderskew"
-#: fdisk/fdiskbsdlabel.c:481
+#: fdisk/fdiskbsdlabel.c:486
msgid "headswitch"
msgstr "headswitch"
-#: fdisk/fdiskbsdlabel.c:482
+#: fdisk/fdiskbsdlabel.c:487
msgid "track-to-track seek"
msgstr "búsqueda pista a pista"
-#: fdisk/fdiskbsdlabel.c:523
+#: fdisk/fdiskbsdlabel.c:528
#, c-format
msgid "Bootstrap: %sboot -> boot%s (%s): "
msgstr "Secuencia de inicio: %sboot -> boot%s (%s): "
-#: fdisk/fdiskbsdlabel.c:548
+#: fdisk/fdiskbsdlabel.c:553
msgid "Bootstrap overlaps with disk label!\n"
msgstr "Solapamientos de secuencia de inicio con etiqueta de disco\n"
-#: fdisk/fdiskbsdlabel.c:569 fdisk/fdiskbsdlabel.c:571
+#: fdisk/fdiskbsdlabel.c:574 fdisk/fdiskbsdlabel.c:576
#, c-format
msgid "Bootstrap installed on %s.\n"
msgstr "Secuencia de inicio instalada en %s.\n"
-#: fdisk/fdiskbsdlabel.c:593
+#: fdisk/fdiskbsdlabel.c:598
#, c-format
msgid "Partition (a-%c): "
msgstr "Partición (a-%c): "
-#: fdisk/fdiskbsdlabel.c:624
+#: fdisk/fdiskbsdlabel.c:629
msgid "This partition already exists.\n"
msgstr "Esta partición ya existe.\n"
-#: fdisk/fdiskbsdlabel.c:744
+#: fdisk/fdiskbsdlabel.c:755
#, c-format
msgid "Warning: too many partitions (%d, maximum is %d).\n"
msgstr "Atención: demasiadas particiones (%d, el valor máximo es %d).\n"
-#: fdisk/fdiskbsdlabel.c:791
+#: fdisk/fdiskbsdlabel.c:803
msgid ""
"\n"
"Syncing disks.\n"
@@ -3170,7 +3405,7 @@ msgid ""
"\te.g. \"/unix\" or \"/unix.save\".\n"
msgstr ""
"\n"
-"Fichero de inicio no válido\n"
+"Fichero de inicio inválido\n"
"\tEl fichero de inicio debe ser un nombre de ruta absoluto\n"
"\tdistinto de cero, como por ejemplo \"/unix\" o \"/unix.save\".\n"
@@ -4998,139 +5233,124 @@ msgstr "getopt (mejorado) 1.1.2\n"
msgid "internal error, contact the author."
msgstr "Error interno; contacte con el desarrollador."
-#: hwclock/cmos.c:168
+#: hwclock/cmos.c:172
msgid "booted from MILO\n"
msgstr "iniciado desde MILO\n"
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:181
msgid "Ruffian BCD clock\n"
msgstr "Reloj BCD Ruffian\n"
-#: hwclock/cmos.c:193
+#: hwclock/cmos.c:197
#, c-format
msgid "clockport adjusted to 0x%x\n"
msgstr "puerto de reloj ajustado a 0x%x\n"
-#: hwclock/cmos.c:205
+#: hwclock/cmos.c:209
msgid "funky TOY!\n"
msgstr "funky TOY!\n"
-#: hwclock/cmos.c:259
+#: hwclock/cmos.c:263
#, c-format
msgid "%s: atomic %s failed for 1000 iterations!"
msgstr "%s: %s atómico ha fallado para 1000 iteraciones."
-#: hwclock/cmos.c:583
+#: hwclock/cmos.c:587
#, c-format
msgid "Cannot open /dev/port: %s"
msgstr "No se puede abrir /dev/port: %s"
-#: hwclock/cmos.c:590
+#: hwclock/cmos.c:594
msgid "I failed to get permission because I didn't try.\n"
msgstr "No se ha podido obtener permiso porque no se ha intentado.\n"
-#: hwclock/cmos.c:593
+#: hwclock/cmos.c:597
#, c-format
msgid "%s is unable to get I/O port access: the iopl(3) call failed.\n"
msgstr ""
"%s no puede obtener acceso al puerto de E/S: la llamada iopl(3) ha fallado.\n"
-#: hwclock/cmos.c:596
+#: hwclock/cmos.c:600
msgid "Probably you need root privileges.\n"
msgstr "Probablemente son necesarios los privilegios de usuario root.\n"
-#: hwclock/hwclock.c:219
+#: hwclock/hwclock.c:223
#, c-format
msgid "Assuming hardware clock is kept in %s time.\n"
msgstr "Se presupone que el reloj de hardware tiene la hora %s.\n"
-#: hwclock/hwclock.c:220 hwclock/hwclock.c:314
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
msgid "UTC"
msgstr "UTC"
-#: hwclock/hwclock.c:220 hwclock/hwclock.c:313
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
msgid "local"
msgstr "local"
-#: hwclock/hwclock.c:297
+#: hwclock/hwclock.c:303
#, c-format
msgid "%s: Warning: unrecognized third line in adjtime file\n"
msgstr "%s: atención: tercera línea no reconocida en el fichero adjtime\n"
-#: hwclock/hwclock.c:299
+#: hwclock/hwclock.c:305
msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
msgstr "(Se esperaba: `UTC', `LOCAL' o nada.)\n"
-#: hwclock/hwclock.c:308
+#: hwclock/hwclock.c:312
#, c-format
msgid "Last drift adjustment done at %ld seconds after 1969\n"
msgstr "Último ajuste de defase realizado %ld segundos después de 1969\n"
-#: hwclock/hwclock.c:310
+#: hwclock/hwclock.c:314
#, c-format
msgid "Last calibration done at %ld seconds after 1969\n"
msgstr "Última calibración realizada %ld segundos después de 1969\n"
-#: hwclock/hwclock.c:312
+#: hwclock/hwclock.c:316
#, c-format
msgid "Hardware clock is on %s time\n"
msgstr "El reloj de hardware tiene la hora %s\n"
-#: hwclock/hwclock.c:314
+#: hwclock/hwclock.c:318
msgid "unknown"
msgstr "desconocido"
-#. -----------------------------------------------------------------------------
-#. 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.
-#.
-#. -----------------------------------------------------------------------------
-#: hwclock/hwclock.c:336
+#: hwclock/hwclock.c:342
msgid "Waiting for clock tick...\n"
msgstr "Esperando señal de reloj...\n"
-#: hwclock/hwclock.c:340
+#: hwclock/hwclock.c:346
msgid "...got clock tick\n"
msgstr "...recibida señal de reloj\n"
-#: hwclock/hwclock.c:391
+#: hwclock/hwclock.c:399
#, c-format
msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
-msgstr ""
-"Valores no válidos en reloj de hardware: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
+msgstr "Valores inválidos en reloj de hardware: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
-#: hwclock/hwclock.c:399
+#: hwclock/hwclock.c:407
#, c-format
msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
msgstr ""
"Hora del reloj de hardware: %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld segundos "
"desde 1969\n"
-#: hwclock/hwclock.c:427
+#: hwclock/hwclock.c:435
#, c-format
msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
msgstr "Hora leída del reloj de hardware: %4d/%.2d/%.2d %02d:%02d:%02d\n"
-#: hwclock/hwclock.c:454
+#: hwclock/hwclock.c:462
#, c-format
msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
msgstr ""
"Estableciendo reloj de hardware en %.2d:%.2d:%.2d = %ld segundos desde 1969\n"
-#: hwclock/hwclock.c:460
+#: hwclock/hwclock.c:468
msgid "Clock not changed - testing only.\n"
msgstr "El reloj no se ha modificado; sólo se está probando.\n"
-#: hwclock/hwclock.c:508
+#: hwclock/hwclock.c:516
#, c-format
msgid ""
"Time elapsed since reference time has been %.6f seconds.\n"
@@ -5139,7 +5359,7 @@ msgstr ""
"El tiempo transcurrido desde la hora de referencia es de %.6f segundos.\n"
"Aumentando el retardo hasta el siguiente segundo completo.\n"
-#: hwclock/hwclock.c:532
+#: hwclock/hwclock.c:540
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"
@@ -5148,20 +5368,20 @@ msgstr ""
"(por ejemplo, día 50 del mes) o exceden el rango que puede utilizarse\n"
"(por ejemplo, el año 2095).\n"
-#: hwclock/hwclock.c:542
+#: hwclock/hwclock.c:550
#, c-format
msgid "%s %.6f seconds\n"
msgstr "%s %.6f segundos\n"
-#: hwclock/hwclock.c:576
+#: hwclock/hwclock.c:584
msgid "No --date option specified.\n"
msgstr "No se ha especificado la opción --date.\n"
-#: hwclock/hwclock.c:582
+#: hwclock/hwclock.c:590
msgid "--date argument too long\n"
msgstr "argumento --date demasiado largo\n"
-#: hwclock/hwclock.c:589
+#: hwclock/hwclock.c:597
msgid ""
"The value of the --date option is not a valid date.\n"
"In particular, it contains quotation marks.\n"
@@ -5169,23 +5389,23 @@ msgstr ""
"El valor de la opción --date no es una fecha válida.\n"
"En concreto, contiene comillas.\n"
-#: hwclock/hwclock.c:597
+#: hwclock/hwclock.c:605
#, c-format
msgid "Issuing date command: %s\n"
msgstr "Ejecutando orden date: %s\n"
-#: hwclock/hwclock.c:601
+#: hwclock/hwclock.c:609
msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
msgstr ""
"No se puede ejecutar el programa 'date' en intérprete de órdenes /bin/sh. "
"popen() ha fallado"
-#: hwclock/hwclock.c:609
+#: hwclock/hwclock.c:617
#, c-format
msgid "response from date command = %s\n"
msgstr "respuesta de la orden date = %s\n"
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:619
#, c-format
msgid ""
"The date command issued by %s returned unexpected results.\n"
@@ -5200,7 +5420,7 @@ msgstr ""
"La respuesta fue:\n"
"%s\n"
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:631
#, c-format
msgid ""
"The date command issued by %s returned something other than an integer where "
@@ -5217,12 +5437,12 @@ msgstr ""
"La respuesta fue:\n"
" %s\n"
-#: hwclock/hwclock.c:634
+#: hwclock/hwclock.c:642
#, c-format
msgid "date string %s equates to %ld seconds since 1969.\n"
msgstr "La cadena de fecha %s equivale a %ld segundos desde 1969.\n"
-#: hwclock/hwclock.c:666
+#: hwclock/hwclock.c:674
msgid ""
"The Hardware Clock does not contain a valid time, so we cannot set the "
"System Time from it.\n"
@@ -5230,35 +5450,35 @@ msgstr ""
"El reloj de hardware no contiene una hora válida, por lo que no se puede "
"establecer la hora del sistema a partir de ese valor.\n"
-#: hwclock/hwclock.c:688
+#: hwclock/hwclock.c:696
msgid "Calling settimeofday:\n"
msgstr "Se está llamando settimeofday:\n"
-#: hwclock/hwclock.c:689
+#: hwclock/hwclock.c:697
#, c-format
msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
-#: hwclock/hwclock.c:691
+#: hwclock/hwclock.c:699
#, c-format
msgid "\ttz.tz_minuteswest = %d\n"
msgstr "\ttz.tz_minuteswest = %d\n"
-#: hwclock/hwclock.c:694
+#: hwclock/hwclock.c:702
msgid "Not setting system clock because running in test mode.\n"
msgstr ""
"No se establece el reloj del sistema ya que la ejecución es en modo de "
"prueba.\n"
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:711
msgid "Must be superuser to set system clock.\n"
msgstr "Debe ser superusuario para establecer el reloj del sistema.\n"
-#: hwclock/hwclock.c:704
+#: hwclock/hwclock.c:714
msgid "settimeofday() failed"
msgstr "settimeofday() ha fallado"
-#: hwclock/hwclock.c:737
+#: hwclock/hwclock.c:744
msgid ""
"Not adjusting drift factor because the Hardware Clock previously contained "
"garbage.\n"
@@ -5266,7 +5486,16 @@ msgstr ""
"No se está ajustando el factor de defase debido a que el reloj de hardware "
"contenía anteriormente datos extraños.\n"
-#: hwclock/hwclock.c:741
+#: hwclock/hwclock.c:749
+#, fuzzy
+msgid ""
+"Not adjusting drift factor because last calibration time is zero,\n"
+"so history is bad and calibration startover is necessary.\n"
+msgstr ""
+"No se está ajustando el factor de defase debido a que hace menos de un día "
+"que se realizó la última calibración.\n"
+
+#: hwclock/hwclock.c:755
msgid ""
"Not adjusting drift factor because it has been less than a day since the "
"last calibration.\n"
@@ -5274,10 +5503,10 @@ msgstr ""
"No se está ajustando el factor de defase debido a que hace menos de un día "
"que se realizó la última calibración.\n"
-#: hwclock/hwclock.c:750
-#, c-format
+#: hwclock/hwclock.c:803
+#, fuzzy, c-format
msgid ""
-"Clock drifted %d seconds in the past %d seconds in spite of a drift factor "
+"Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
"of %f seconds/day.\n"
"Adjusting drift factor by %f seconds/day\n"
msgstr ""
@@ -5285,23 +5514,23 @@ msgstr ""
"utilizar un factor de defase de %f segundos por día.\n"
"Se está ajustando el factor de defase en %f segundos por día\n"
-#: hwclock/hwclock.c:801
+#: hwclock/hwclock.c:854
#, c-format
msgid "Time since last adjustment is %d seconds\n"
msgstr "El tiempo transcurrido desde el último ajuste es de %d segundos\n"
-#: hwclock/hwclock.c:803
+#: hwclock/hwclock.c:856
#, c-format
msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
msgstr ""
"Es preciso insertar %d segundos y establecer como referencia la hora %.6f "
"segundos hacia atrás\n"
-#: hwclock/hwclock.c:832
+#: hwclock/hwclock.c:885
msgid "Not updating adjtime file because of testing mode.\n"
msgstr "No se está actualizando el fichero adjtime debido al modo de prueba.\n"
-#: hwclock/hwclock.c:833
+#: hwclock/hwclock.c:886
#, c-format
msgid ""
"Would have written the following to %s:\n"
@@ -5310,37 +5539,37 @@ msgstr ""
"Se habría escrito lo siguiente en %s:\n"
"%s"
-#: hwclock/hwclock.c:857
+#: hwclock/hwclock.c:910
msgid "Drift adjustment parameters not updated.\n"
msgstr "Parámetros de ajuste del defase no actualizados.\n"
-#: hwclock/hwclock.c:898
+#: hwclock/hwclock.c:951
msgid ""
"The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
msgstr ""
"El reloj de hardware no contiene una hora válida, por lo que no se puede "
"ajustar.\n"
-#: hwclock/hwclock.c:922
+#: hwclock/hwclock.c:983
msgid "Needed adjustment is less than one second, so not setting clock.\n"
msgstr ""
"El ajuste necesario es inferior a un segundo, por lo que no se establece el "
"reloj.\n"
-#: hwclock/hwclock.c:948
+#: hwclock/hwclock.c:1009
#, c-format
msgid "Using %s.\n"
msgstr "Utilizando %s.\n"
-#: hwclock/hwclock.c:950
+#: hwclock/hwclock.c:1011
msgid "No usable clock interface found.\n"
msgstr "No se ha encontrado ninguna interfaz de reloj utilizable.\n"
-#: hwclock/hwclock.c:1045
+#: hwclock/hwclock.c:1107
msgid "Unable to set system clock.\n"
msgstr "No se puede establecer el reloj del sistema.\n"
-#: hwclock/hwclock.c:1076
+#: hwclock/hwclock.c:1137
msgid ""
"The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
"machine.\n"
@@ -5352,16 +5581,16 @@ msgstr ""
"Alpha (por lo que posiblemente no se está ejecutando en una máquina Alpha).\n"
"No se efectúa ninguna acción.\n"
-#: hwclock/hwclock.c:1085
+#: hwclock/hwclock.c:1146
msgid "Unable to get the epoch value from the kernel.\n"
msgstr "No se puede obtener el valor de época del núcleo.\n"
-#: hwclock/hwclock.c:1087
+#: hwclock/hwclock.c:1148
#, c-format
msgid "Kernel is assuming an epoch value of %lu\n"
msgstr "El núcleo presupone el valor de época %lu\n"
-#: hwclock/hwclock.c:1090
+#: hwclock/hwclock.c:1151
msgid ""
"To set the epoch value, you must use the 'epoch' option to tell to what "
"value to set it.\n"
@@ -5369,17 +5598,17 @@ msgstr ""
"Para establecer el valor de época, debe utilizar la opción 'epoch' para "
"indicar en qué valor debe definirse.\n"
-#: hwclock/hwclock.c:1093
+#: hwclock/hwclock.c:1154
#, c-format
msgid "Not setting the epoch to %d - testing only.\n"
msgstr ""
"No se está estableciendo el valor de época en %d; sólo se está probando.\n"
-#: hwclock/hwclock.c:1096
+#: hwclock/hwclock.c:1157
msgid "Unable to set the epoch value in the kernel.\n"
msgstr "No se puede establecer el valor de época en el núcleo.\n"
-#: hwclock/hwclock.c:1125
+#: hwclock/hwclock.c:1191
#, c-format
msgid ""
"hwclock - query and set the hardware clock (RTC)\n"
@@ -5444,7 +5673,7 @@ msgstr ""
" --noadjfile No accede a /etc/adjtime. Necesita del uso de --utc\n"
" o de --localtime\n"
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1218
msgid ""
" --jensen, --arc, --srm, --funky-toy\n"
" tell hwclock the type of alpha you have (see hwclock(8))\n"
@@ -5453,20 +5682,21 @@ msgstr ""
" Indica al reloj de hardware el tipo de Alpha (ver hwclock"
"(8))\n"
-#: hwclock/hwclock.c:1257
+#: hwclock/hwclock.c:1392
#, c-format
msgid "%s takes no non-option arguments. You supplied %d.\n"
msgstr "%s no admite argumentos que no sean opciones. Ha especificado %d.\n"
-#: hwclock/hwclock.c:1267
+#: hwclock/hwclock.c:1398
+#, fuzzy
msgid ""
-"You have specified multiple function options.\n"
+"You have specified multiple functions.\n"
"You can only perform one function at a time.\n"
msgstr ""
"Ha especificado varias opciones de funciones.\n"
"Sólo puede llevar a cabo una función a la vez.\n"
-#: hwclock/hwclock.c:1273
+#: hwclock/hwclock.c:1405
#, c-format
msgid ""
"%s: The --utc and --localtime options are mutually exclusive. You specified "
@@ -5475,7 +5705,7 @@ msgstr ""
"%s: las opciones --utc y --localtime se excluyen mutuamente. Ha especificado "
"ambas.\n"
-#: hwclock/hwclock.c:1279
+#: hwclock/hwclock.c:1412
#, c-format
msgid ""
"%s: The --adjust and --noadjfile options are mutually exclusive. You "
@@ -5484,25 +5714,25 @@ msgstr ""
"%s: las opciones --adjust y --noadjfile se excluyen mutuamente. Ha "
"especificado ambas.\n"
-#: hwclock/hwclock.c:1285
+#: hwclock/hwclock.c:1419
#, c-format
msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
msgstr ""
"%s: Con --noadjfile, debe especificarse o bien --utc o bien --localtime\n"
-#: hwclock/hwclock.c:1298
+#: hwclock/hwclock.c:1433
msgid "No usable set-to time. Cannot set clock.\n"
msgstr "Hora no utilizable. No se puede establecer el reloj.\n"
-#: hwclock/hwclock.c:1313
+#: hwclock/hwclock.c:1449
msgid "Sorry, only the superuser can change the Hardware Clock.\n"
msgstr "Únicamente el superusuario puede cambiar el reloj de hardware.\n"
-#: hwclock/hwclock.c:1317
+#: hwclock/hwclock.c:1454
msgid "Sorry, only the superuser can change the System Clock.\n"
msgstr "Únicamente el superusuario puede cambiar el reloj del sistema.\n"
-#: hwclock/hwclock.c:1321
+#: hwclock/hwclock.c:1459
msgid ""
"Sorry, only the superuser can change the Hardware Clock epoch in the "
"kernel.\n"
@@ -5510,11 +5740,11 @@ msgstr ""
"Sólo el superusuario puede cambiar el valor de época del reloj de hardware "
"del núcleo.\n"
-#: hwclock/hwclock.c:1341
+#: hwclock/hwclock.c:1479
msgid "Cannot access the Hardware Clock via any known method.\n"
msgstr "No se puede acceder al reloj de hardware por ningún método conocido.\n"
-#: hwclock/hwclock.c:1344
+#: hwclock/hwclock.c:1483
msgid ""
"Use the --debug option to see the details of our search for an access "
"method.\n"
@@ -5522,96 +5752,91 @@ msgstr ""
"Utilice la opción --debug para ver los detalles de la búsqueda para un "
"método de acceso.\n"
-#: hwclock/kd.c:42
+#: hwclock/kd.c:43
msgid "Waiting in loop for time from KDGHWCLK to change\n"
msgstr "Esperando en bucle que cambie la hora de KDGHWCLK\n"
-#: hwclock/kd.c:45
+#: hwclock/kd.c:46
msgid "KDGHWCLK ioctl to read time failed"
msgstr "Error de ioctl KDGHWCLK al leer la hora"
-#: hwclock/kd.c:66 hwclock/rtc.c:174
+#: hwclock/kd.c:67 hwclock/rtc.c:187
msgid "Timed out waiting for time change.\n"
msgstr "Se ha excedido el tiempo de espera del cambio de hora.\n"
-#: hwclock/kd.c:70
+#: hwclock/kd.c:71
msgid "KDGHWCLK ioctl to read time failed in loop"
msgstr "Error en bucle de ioctl KDGHWCLK al leer la hora"
-#: hwclock/kd.c:92
+#: hwclock/kd.c:93
#, c-format
msgid "ioctl() failed to read time from %s"
msgstr "ioctl() no ha podido leer la hora de %s"
-#: hwclock/kd.c:128
+#: hwclock/kd.c:129
msgid "ioctl KDSHWCLK failed"
msgstr "Error de ioctl KDGHWCLK"
-#: hwclock/kd.c:165
+#: hwclock/kd.c:166
msgid "Can't open /dev/tty1 or /dev/vc/1"
msgstr "No se puede abrir /dev/tty1 o /dev/vc/1"
-#: hwclock/kd.c:170
+#: hwclock/kd.c:171
msgid "KDGHWCLK ioctl failed"
msgstr "Error de ioctl KDGHWCLK"
-#: hwclock/rtc.c:136
+#: hwclock/rtc.c:115 hwclock/rtc.c:208
+#, c-format
+msgid "open() of %s failed"
+msgstr "Error de open() de %s"
+
+#: hwclock/rtc.c:149
#, c-format
msgid "ioctl() to %s to read the time failed.\n"
msgstr "Error de ioctl() con %s al leer la hora.\n"
-#: hwclock/rtc.c:158
+#: hwclock/rtc.c:171
#, c-format
msgid "Waiting in loop for time from %s to change\n"
msgstr "Esperando en bucle que cambie la hora de %s\n"
-#: hwclock/rtc.c:195 hwclock/rtc.c:250
-#, c-format
-msgid "open() of %s failed"
-msgstr "Error de open() de %s"
-
-#: hwclock/rtc.c:213
+#: hwclock/rtc.c:226
#, c-format
msgid "%s does not have interrupt functions. "
msgstr "%s no tiene funciones de interrupción. "
-#: hwclock/rtc.c:222
+#: hwclock/rtc.c:235
#, c-format
msgid "read() to %s to wait for clock tick failed"
msgstr "Error de read() de %s al esperar señal de reloj"
-#: hwclock/rtc.c:231
+#: hwclock/rtc.c:244
#, c-format
msgid "ioctl() to %s to turn off update interrupts failed"
msgstr "Error de ioctl() con %s al desactivar interrupciones de actualización"
-#: hwclock/rtc.c:234
+#: hwclock/rtc.c:247
#, c-format
msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
msgstr ""
"Error inesperado de ioctl() con %s al activar interrupciones de actualización"
-#: hwclock/rtc.c:274 hwclock/rtc.c:358 hwclock/rtc.c:404
-#, c-format
-msgid "Unable to open %s"
-msgstr "No se puede abrir %s"
-
-#: hwclock/rtc.c:300
+#: hwclock/rtc.c:306
#, c-format
msgid "ioctl() to %s to set the time failed.\n"
msgstr "Error de ioctl() con %s al establecer la hora.\n"
-#: hwclock/rtc.c:306
+#: hwclock/rtc.c:312
#, c-format
msgid "ioctl(%s) was successful.\n"
msgstr "ioctl(%s) ha finalizado correctamente.\n"
-#: hwclock/rtc.c:335
+#: hwclock/rtc.c:341
#, c-format
msgid "Open of %s failed"
msgstr "Error al abrir %s"
-#: hwclock/rtc.c:353 hwclock/rtc.c:399
+#: hwclock/rtc.c:359 hwclock/rtc.c:405
#, c-format
msgid ""
"To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
@@ -5623,12 +5848,17 @@ msgstr ""
"dispositivo 'rtc' de Linux mediante el fichero especial de dispositivo %s.\n"
"Este fichero no existe en este sistema.\n"
-#: hwclock/rtc.c:365
+#: hwclock/rtc.c:364 hwclock/rtc.c:410
+#, c-format
+msgid "Unable to open %s"
+msgstr "No se puede abrir %s"
+
+#: hwclock/rtc.c:371
#, c-format
msgid "ioctl(RTC_EPOCH_READ) to %s failed"
msgstr "Error de ioctl(RTC_EPOCH_READ) con %s"
-#: hwclock/rtc.c:371
+#: hwclock/rtc.c:377
#, c-format
msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
msgstr "Se ha leído el valor de época %ld de %s con ioctl RTC_EPOCH_READ.\n"
@@ -5636,17 +5866,17 @@ msgstr "Se ha leído el valor de época %ld de %s con ioctl RTC_EPOCH_READ.\n"
#. kernel would not accept this epoch value
#. Hmm - bad habit, deciding not to do what the user asks
#. just because one believes that the kernel might not like it.
-#: hwclock/rtc.c:391
+#: hwclock/rtc.c:397
#, c-format
msgid "The epoch value may not be less than 1900. You requested %ld\n"
msgstr "El valor de época no puede ser inferior a 1900. Ha solicitado %ld\n"
-#: hwclock/rtc.c:409
+#: hwclock/rtc.c:415
#, c-format
msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
msgstr "Estableciendo época en %ld con ioctl RTC_EPOCH_SET en %s.\n"
-#: hwclock/rtc.c:414
+#: hwclock/rtc.c:420
#, c-format
msgid ""
"The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
@@ -5654,41 +5884,11 @@ msgstr ""
"El controlador de dispositivo del núcleo para %s no tiene la ioctl "
"RTC_EPOCH_SET.\n"
-#: hwclock/rtc.c:417
+#: hwclock/rtc.c:423
#, c-format
msgid "ioctl(RTC_EPOCH_SET) to %s failed"
msgstr "Error de ioctl(RTC_EPOCH_SET) de %s"
-#: hwclock/shhopt.c:255 hwclock/shhopt.c:281
-#, c-format
-msgid "invalid number `%s'\n"
-msgstr "Número `%s' no válido\n"
-
-#: hwclock/shhopt.c:258 hwclock/shhopt.c:284
-#, c-format
-msgid "number `%s' to `%s' out of range\n"
-msgstr "El número de `%s' a `%s' está fuera de rango\n"
-
-#: hwclock/shhopt.c:398
-#, c-format
-msgid "unrecognized option `%s'\n"
-msgstr "Opción `%s' no reconocida\n"
-
-#: hwclock/shhopt.c:411 hwclock/shhopt.c:449
-#, c-format
-msgid "option `%s' requires an argument\n"
-msgstr "La opción `%s' necesita un argumento\n"
-
-#: hwclock/shhopt.c:417
-#, c-format
-msgid "option `%s' doesn't allow an argument\n"
-msgstr "La opción `%s' no admite ningún argumento\n"
-
-#: hwclock/shhopt.c:439
-#, c-format
-msgid "unrecognized option `-%c'\n"
-msgstr "Opción `-%c' no reconocida\n"
-
#: login-utils/agetty.c:312
msgid "calling open_tty\n"
msgstr "calling open_tty\n"
@@ -6739,7 +6939,7 @@ msgstr "La apertura del directorio ha fallado\n"
msgid "fork failed\n"
msgstr "La bifurcación (fork) ha fallado\n"
-#: login-utils/simpleinit.c:512 text-utils/more.c:1705
+#: login-utils/simpleinit.c:512 text-utils/more.c:1706
msgid "exec failed\n"
msgstr "La ejecución (exec) ha fallado\n"
@@ -7534,162 +7734,162 @@ msgstr "[mntent]: la línea %d de %s es incorrecta%s\n"
msgid "; rest of file ignored"
msgstr "; el resto del fichero no se tiene en cuenta"
-#: mount/mount.c:379
+#: mount/mount.c:381
#, c-format
msgid "mount: according to mtab, %s is already mounted on %s"
msgstr "mount: según mtab, %s ya está montado en %s"
-#: mount/mount.c:383
+#: mount/mount.c:385
#, c-format
msgid "mount: according to mtab, %s is mounted on %s"
msgstr "mount: según mtab, %s está montado en %s"
-#: mount/mount.c:404
+#: mount/mount.c:406
#, c-format
msgid "mount: can't open %s for writing: %s"
msgstr "mount: no se puede abrir %s para escritura: %s"
-#: mount/mount.c:419 mount/mount.c:638
+#: mount/mount.c:421 mount/mount.c:640
#, c-format
msgid "mount: error writing %s: %s"
msgstr "mount: error al escribir %s: %s"
-#: mount/mount.c:426
+#: mount/mount.c:428
#, c-format
msgid "mount: error changing mode of %s: %s"
msgstr "mount: error al cambiar el modo de %s: %s"
-#: mount/mount.c:472
+#: mount/mount.c:474
#, c-format
msgid "%s looks like swapspace - not mounted"
msgstr "%s parece espacio de intercambio - no montado"
-#: mount/mount.c:532
+#: mount/mount.c:534
msgid "mount failed"
msgstr "montaje erróneo"
-#: mount/mount.c:534
+#: mount/mount.c:536
#, c-format
msgid "mount: only root can mount %s on %s"
msgstr "mount: sólo el usuario root puede montar %s en %s"
-#: mount/mount.c:562
+#: mount/mount.c:564
msgid "mount: loop device specified twice"
msgstr "mount: dispositivo de bucle especificado dos veces"
-#: mount/mount.c:567
+#: mount/mount.c:569
msgid "mount: type specified twice"
msgstr "mount: tipo especificado dos veces"
-#: mount/mount.c:579
+#: mount/mount.c:581
msgid "mount: skipping the setup of a loop device\n"
msgstr "mount: omitiendo la configuración de un dispositivo de bucle\n"
-#: mount/mount.c:588
+#: mount/mount.c:590
#, c-format
msgid "mount: going to use the loop device %s\n"
msgstr "mount: se va a utilizar el dispositivo de bucle %s\n"
-#: mount/mount.c:592
+#: mount/mount.c:594
msgid "mount: failed setting up loop device\n"
msgstr "mount: error al configurar dispositivo de bucle\n"
-#: mount/mount.c:596
+#: mount/mount.c:598
msgid "mount: setup loop device successfully\n"
msgstr "mount: configuración correcta de dispositivo de bucle\n"
-#: mount/mount.c:633
+#: mount/mount.c:635
#, c-format
msgid "mount: can't open %s: %s"
msgstr "mount: no se puede abrir %s: %s"
-#: mount/mount.c:656
+#: mount/mount.c:658
#, c-format
msgid "mount: cannot open %s for setting speed"
msgstr "mount: no se puede abrir %s para establecer la velocidad"
-#: mount/mount.c:659
+#: mount/mount.c:661
#, c-format
msgid "mount: cannot set speed: %s"
msgstr "mount: no se puede establecer la velocidad: %s"
-#: mount/mount.c:720 mount/mount.c:1265
+#: mount/mount.c:722 mount/mount.c:1295
#, c-format
msgid "mount: cannot fork: %s"
msgstr "mount: no se puede bifurcar (fork): %s"
-#: mount/mount.c:800
+#: mount/mount.c:802
msgid "mount: this version was compiled without support for the type `nfs'"
msgstr "mount: esta versión se ha compilado sin soporte para el tipo `nfs'"
# FIXME: Falta un . en el original.
-#: mount/mount.c:839
+#: mount/mount.c:841
msgid "mount: failed with nfs mount version 4, trying 3..\n"
msgstr "mount: falló con la versión 4 de nfs mount, probando con la 3...\n"
-#: mount/mount.c:850
+#: mount/mount.c:852
msgid ""
"mount: I could not determine the filesystem type, and none was specified"
msgstr ""
"mount: no se ha podido determinar el tipo de sistema de ficheros y no se ha\n"
"especificado ninguno"
-#: mount/mount.c:853
+#: mount/mount.c:855
msgid "mount: you must specify the filesystem type"
msgstr "mount: debe especificar el tipo de sistema de ficheros"
#. should not happen
-#: mount/mount.c:856
+#: mount/mount.c:858
msgid "mount: mount failed"
msgstr "mount: montaje erróneo"
-#: mount/mount.c:862 mount/mount.c:897
+#: mount/mount.c:864 mount/mount.c:899
#, c-format
msgid "mount: mount point %s is not a directory"
msgstr "mount: el punto de montaje %s no es un directorio"
-#: mount/mount.c:864
+#: mount/mount.c:866
msgid "mount: permission denied"
msgstr "mount: permiso denegado"
-#: mount/mount.c:866
+#: mount/mount.c:868
msgid "mount: must be superuser to use mount"
msgstr "mount: debe ser superusuario para utilizar mount"
#. heuristic: if /proc/version exists, then probably proc is mounted
#. proc mounted?
-#: mount/mount.c:870 mount/mount.c:874
+#: mount/mount.c:872 mount/mount.c:876
#, c-format
msgid "mount: %s is busy"
msgstr "mount: %s está ocupado"
#. no
#. yes, don't mention it
-#: mount/mount.c:876
+#: mount/mount.c:878
msgid "mount: proc already mounted"
msgstr "mount: proc ya está montado"
-#: mount/mount.c:878
+#: mount/mount.c:880
#, c-format
msgid "mount: %s already mounted or %s busy"
msgstr "mount: %s ya está montado o %s está ocupado"
-#: mount/mount.c:884
+#: mount/mount.c:886
#, c-format
msgid "mount: mount point %s does not exist"
msgstr "mount: el punto de montaje %s no existe"
-#: mount/mount.c:886
+#: mount/mount.c:888
#, c-format
msgid "mount: mount point %s is a symbolic link to nowhere"
msgstr "mount: el punto de montaje %s es un enlace simbólico sin destino"
-#: mount/mount.c:889
+#: mount/mount.c:891
#, c-format
msgid "mount: special device %s does not exist"
msgstr "mount: el dispositivo especial %s no existe"
-#: mount/mount.c:899
+#: mount/mount.c:901
#, c-format
msgid ""
"mount: special device %s does not exist\n"
@@ -7698,12 +7898,12 @@ msgstr ""
"mount: el dispositivo especial %s no existe\n"
" (un prefijo de ruta no es un directorio)\n"
-#: mount/mount.c:912
+#: mount/mount.c:914
#, c-format
msgid "mount: %s not mounted already, or bad option"
msgstr "mount: %s no está montado todavía o una opción es incorrecta"
-#: mount/mount.c:914
+#: mount/mount.c:916
#, c-format
msgid ""
"mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -7713,36 +7913,36 @@ msgstr ""
"superbloque incorrecto en %s,\n"
" o número de sistemas de ficheros montados excesivo"
-#: mount/mount.c:948
+#: mount/mount.c:950
msgid "mount table full"
msgstr "tabla de dispositivos montados completa"
-#: mount/mount.c:950
+#: mount/mount.c:952
#, c-format
msgid "mount: %s: can't read superblock"
msgstr "mount: %s: no se puede leer el superbloque"
-#: mount/mount.c:954
+#: mount/mount.c:956
#, c-format
msgid "mount: %s: unknown device"
msgstr "umount: %s: dispositivo desconocido"
-#: mount/mount.c:959
+#: mount/mount.c:961
#, c-format
msgid "mount: fs type %s not supported by kernel"
msgstr ""
"mount: el tipo de sistema de ficheros %s no está soportado por el núcleo"
-#: mount/mount.c:971
+#: mount/mount.c:973
#, c-format
msgid "mount: probably you meant %s"
msgstr "mount: probablemente quería referirse a %s"
-#: mount/mount.c:973
+#: mount/mount.c:975
msgid "mount: maybe you meant iso9660 ?"
msgstr "mount: ¿tal vez quería referirse a iso9660?"
-#: mount/mount.c:976
+#: mount/mount.c:978
#, c-format
msgid "mount: %s has wrong device number or fs type %s not supported"
msgstr ""
@@ -7750,12 +7950,12 @@ msgstr ""
"%s no soportado"
#. strange ...
-#: mount/mount.c:982
+#: mount/mount.c:984
#, c-format
msgid "mount: %s is not a block device, and stat fails?"
msgstr "mount: %s no es un dispositivo de bloques y ¿stat falla?"
-#: mount/mount.c:984
+#: mount/mount.c:986
#, c-format
msgid ""
"mount: the kernel does not recognize %s as a block device\n"
@@ -7764,96 +7964,103 @@ msgstr ""
"mount: el núcleo no reconoce %s como dispositivo de bloques\n"
" (¿tal vez `insmod driver'?)"
-#: mount/mount.c:987
+#: mount/mount.c:989
#, c-format
msgid "mount: %s is not a block device (maybe try `-o loop'?)"
msgstr "mount: %s no es un dispositivo de bloques (pruebe `-o loop')"
-#: mount/mount.c:990
+#: mount/mount.c:992
#, c-format
msgid "mount: %s is not a block device"
msgstr "mount: %s no es un dispositivo de bloques"
-#: mount/mount.c:993
+#: mount/mount.c:995
#, c-format
msgid "mount: %s is not a valid block device"
msgstr "mount: %s no es un dispositivo de bloques válido"
#. pre-linux 1.1.38, 1.1.41 and later
#. linux 1.1.38 and later
-#: mount/mount.c:996
+#: mount/mount.c:998
msgid "block device "
msgstr "dispositivo de bloques "
-#: mount/mount.c:998
+#: mount/mount.c:1000
#, c-format
msgid "mount: cannot mount %s%s read-only"
msgstr "umount: no se puede montar %s%s de sólo lectura"
-#: mount/mount.c:1002
+#: mount/mount.c:1004
#, c-format
msgid "mount: %s%s is write-protected but explicit `-w' flag given"
msgstr ""
"mount: %s%s está protegido contra escritura pero se ha dado la opción `-w'"
-#: mount/mount.c:1018
+#: mount/mount.c:1020
#, c-format
msgid "mount: %s%s is write-protected, mounting read-only"
msgstr ""
"mount: %s%s está protegido contra escritura; se monta como sólo lectura"
-#: mount/mount.c:1104
+#: mount/mount.c:1107
#, c-format
msgid "mount: the label %s occurs on both %s and %s\n"
msgstr "mount: la etiqueta %s aparece tanto en %s como en %s\n"
-#: mount/mount.c:1108
+#: mount/mount.c:1111
#, c-format
msgid "mount: %s duplicate - not mounted"
msgstr "mount: %s duplicado - no se monta"
-#: mount/mount.c:1118
+#: mount/mount.c:1121
#, c-format
msgid "mount: going to mount %s by %s\n"
msgstr "mount: se montará %s mediante %s\n"
-#: mount/mount.c:1119
+#: mount/mount.c:1122
msgid "UUID"
msgstr "UUID"
-#: mount/mount.c:1119
+#: mount/mount.c:1122
msgid "label"
msgstr "etiqueta"
-#: mount/mount.c:1121 mount/mount.c:1521
+#: mount/mount.c:1124 mount/mount.c:1555
msgid "mount: no such partition found"
msgstr "mount: no se ha encontrado esta partición"
-#: mount/mount.c:1129
+#: mount/mount.c:1132
msgid "mount: no type was given - I'll assume nfs because of the colon\n"
msgstr ""
"mount: no se ha especificado ningún tipo; se presupone nfs por los dos "
"puntos\n"
+#: mount/mount.c:1137
+#, fuzzy
+msgid "mount: no type was given - I'll assume smb because of the // prefix\n"
+msgstr ""
+"mount: no se ha especificado ningún tipo; se presupone nfs por los dos "
+"puntos\n"
+
#.
#. * Retry in the background.
#.
-#: mount/mount.c:1145
+#: mount/mount.c:1153
#, c-format
msgid "mount: backgrounding \"%s\"\n"
msgstr "mount: ejecutando en segundo plano \"%s\"\n"
-#: mount/mount.c:1156
+#: mount/mount.c:1164
#, c-format
msgid "mount: giving up \"%s\"\n"
msgstr "mount: se abandona \"%s\"\n"
-#: mount/mount.c:1216
+#: mount/mount.c:1240
#, c-format
msgid "mount: %s already mounted on %s\n"
msgstr "mount: %s ya está montado en %s\n"
-#: mount/mount.c:1335
+#: mount/mount.c:1369
msgid ""
"Usage: mount -V : print version\n"
" mount -h : print this help\n"
@@ -7901,40 +8108,40 @@ msgstr ""
"Otras opciones: [-nfFrsvw] [-o opciones].\n"
"Escriba man 8 mount para saber mucho más.\n"
-#: mount/mount.c:1497
+#: mount/mount.c:1531
msgid "mount: only root can do that"
msgstr "mount: sólo el usuario root puede efectuar esta acción"
-#: mount/mount.c:1502
+#: mount/mount.c:1536
#, c-format
msgid "mount: no %s found - creating it..\n"
msgstr "mount: no se ha encontrado %s; se está creando...\n"
-#: mount/mount.c:1516
+#: mount/mount.c:1550
#, c-format
msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
msgstr "mount: la etiqueta %s aparece tanto en %s como en %s - no se monta\n"
-#: mount/mount.c:1523
+#: mount/mount.c:1557
#, c-format
msgid "mount: mounting %s\n"
msgstr "mount: montando %s\n"
-#: mount/mount.c:1532
+#: mount/mount.c:1566
msgid "nothing was mounted"
msgstr "no se ha montado nada"
-#: mount/mount.c:1547
+#: mount/mount.c:1581
#, c-format
msgid "mount: cannot find %s in %s"
msgstr "mount: no se puede encontrar %s en %s"
-#: mount/mount.c:1562
+#: mount/mount.c:1596
#, c-format
msgid "mount: can't find %s in %s or %s"
msgstr "mount: no se puede encontrar %s en %s o %s"
-#: mount/mount_by_label.c:169
+#: mount/mount_by_label.c:199
#, c-format
msgid ""
"mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
@@ -7942,34 +8149,34 @@ msgstr ""
"mount: no se ha podido abrir %s; así que no se puede efectuar la conversión\n"
"de UUID y ETIQUETA\n"
-#: mount/mount_by_label.c:295
+#: mount/mount_by_label.c:325
msgid "mount: bad UUID"
msgstr "mount: UUID incorrecto"
-#: mount/mount_guess_fstype.c:487
+#: mount/mount_guess_fstype.c:482
msgid "mount: error while guessing filesystem type\n"
msgstr "mount: error al intentar adivinar el tipo de sistema de ficheros\n"
-#: mount/mount_guess_fstype.c:496
+#: mount/mount_guess_fstype.c:491
#, c-format
msgid "mount: you didn't specify a filesystem type for %s\n"
msgstr "mount: no ha especificado ningún tipo de sistema de ficheros para %s\n"
-#: mount/mount_guess_fstype.c:499
+#: mount/mount_guess_fstype.c:494
#, c-format
msgid " I will try all types mentioned in %s or %s\n"
msgstr " Se probará con todos los tipos indicados en %s o %s\n"
-#: mount/mount_guess_fstype.c:502
+#: mount/mount_guess_fstype.c:497
msgid " and it looks like this is swapspace\n"
msgstr " y parece que sea un espacio de intercambio\n"
-#: mount/mount_guess_fstype.c:504
+#: mount/mount_guess_fstype.c:499
#, c-format
msgid " I will try type %s\n"
msgstr " Se probará con el tipo %s\n"
-#: mount/mount_guess_fstype.c:592
+#: mount/mount_guess_fstype.c:587
#, c-format
msgid "Trying %s\n"
msgstr "Probando con %s\n"
@@ -8063,7 +8270,7 @@ msgstr "Valor de retorno de nfs status desconocido: %d"
msgid "bug in xstrndup call"
msgstr "Error en la llamada xstrndup"
-#: mount/swapon.c:51
+#: mount/swapon.c:56
#, c-format
msgid ""
"usage: %s [-hV]\n"
@@ -8076,29 +8283,46 @@ msgstr ""
" %s [-v] [-p prioridad] special ...\n"
" %s [-s]\n"
-#: mount/swapon.c:88
+#: mount/swapon.c:66
+#, fuzzy, c-format
+msgid ""
+"usage: %s [-hV]\n"
+" %s -a [-v]\n"
+" %s [-v] special ...\n"
+msgstr ""
+"uso: %s [-hV]\n"
+" %s -a [-v]\n"
+" %s [-v] [-p prioridad] special ...\n"
+" %s [-s]\n"
+
+#: mount/swapon.c:170 mount/swapon.c:234
#, c-format
msgid "%s on %s\n"
msgstr "%s en %s\n"
-#: mount/swapon.c:93
+#: mount/swapon.c:174
#, c-format
msgid "swapon: cannot stat %s: %s\n"
msgstr "swapon: no se puede ejecutar stat para %s: %s\n"
-#: mount/swapon.c:105
+#: mount/swapon.c:185
#, c-format
msgid "swapon: warning: %s has insecure permissions %04o, %04o suggested\n"
msgstr ""
"swapon: atención: %s tiene permisos %04o que no son seguros, se sugiere %"
"04o\n"
-#: mount/swapon.c:115
+#: mount/swapon.c:197
#, c-format
msgid "swapon: Skipping file %s - it appears to have holes.\n"
msgstr "swapon: omitiendo el fichero %s; parece que tiene huecos.\n"
-#: mount/swapon.c:222
+#: mount/swapon.c:240
+#, fuzzy
+msgid "Not superuser.\n"
+msgstr "No establecido\n"
+
+#: mount/swapon.c:298 mount/swapon.c:386
#, c-format
msgid "%s: cannot open %s: %s\n"
msgstr "%s: no se puede abrir %s: %s\n"
@@ -8124,7 +8348,7 @@ msgstr "umount: valor incorrecto para hostp->h_length\n"
#: mount/umount.c:222
#, c-format
msgid "umount: %s: invalid block device"
-msgstr "umount: %s: dispositivo de bloques no válido"
+msgstr "umount: %s: dispositivo de bloques inválido"
#: mount/umount.c:224
#, c-format
@@ -8274,27 +8498,27 @@ msgstr ""
#: sys-utils/cytune.c:195
#, c-format
msgid "Invalid interval value: %s\n"
-msgstr "Valor de intervalo no válido: %s\n"
+msgstr "Valor de intervalo inválido: %s\n"
#: sys-utils/cytune.c:203
#, c-format
msgid "Invalid set value: %s\n"
-msgstr "Valor establecido no válido: %s\n"
+msgstr "Valor establecido inválido: %s\n"
#: sys-utils/cytune.c:211
#, c-format
msgid "Invalid default value: %s\n"
-msgstr "Valor predeterminado no válido: %s\n"
+msgstr "Valor predeterminado inválido: %s\n"
#: sys-utils/cytune.c:219
#, c-format
msgid "Invalid set time value: %s\n"
-msgstr "Valor de hora establecido no válido: %s\n"
+msgstr "Valor de hora establecido inválido: %s\n"
#: sys-utils/cytune.c:227
#, c-format
msgid "Invalid default time value: %s\n"
-msgstr "Valor de hora predeterminado no válido: %s\n"
+msgstr "Valor de hora predeterminado inválido: %s\n"
#: sys-utils/cytune.c:244
#, c-format
@@ -8473,22 +8697,22 @@ msgstr "%s: %s (%s)\n"
msgid "%s: unknown argument: %s\n"
msgstr "%s: argumento desconocido: %s\n"
-#: sys-utils/ipcs.c:122
+#: sys-utils/ipcs.c:121
#, c-format
msgid "usage : %s -asmq -tclup \n"
msgstr "uso: %s -asmq -tclup \n"
-#: sys-utils/ipcs.c:123
+#: sys-utils/ipcs.c:122
#, c-format
msgid "\t%s [-s -m -q] -i id\n"
msgstr "\t%s [-s -m -q] -i id\n"
-#: sys-utils/ipcs.c:124
+#: sys-utils/ipcs.c:123
#, c-format
msgid "\t%s -h for help.\n"
msgstr "\t%s -h para obtener ayuda.\n"
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:129
#, c-format
msgid ""
"%s provides information on ipc facilities for which you have read access.\n"
@@ -8496,7 +8720,7 @@ msgstr ""
"%s facilita información sobre los recursos ipc para los cuales tiene\n"
"acceso de lectura.\n"
-#: sys-utils/ipcs.c:132
+#: sys-utils/ipcs.c:131
msgid ""
"Resource Specification:\n"
"\t-m : shared_mem\n"
@@ -8506,7 +8730,7 @@ msgstr ""
"\t-m : memoria compartida\n"
"\t-q : mensajes\n"
-#: sys-utils/ipcs.c:133
+#: sys-utils/ipcs.c:132
msgid ""
"\t-s : semaphores\n"
"\t-a : all (default)\n"
@@ -8514,7 +8738,7 @@ msgstr ""
"\t-s : semáforos\n"
"\t-a : todo (valor predeterminado)\n"
-#: sys-utils/ipcs.c:134
+#: sys-utils/ipcs.c:133
msgid ""
"Output Format:\n"
"\t-t : time\n"
@@ -8526,7 +8750,7 @@ msgstr ""
"\t-p : pid\n"
"\t-c : creador\n"
-#: sys-utils/ipcs.c:135
+#: sys-utils/ipcs.c:134
msgid ""
"\t-l : limits\n"
"\t-u : summary\n"
@@ -8534,378 +8758,378 @@ msgstr ""
"\t-l : límites\n"
"\t-u : resumen\n"
-#: sys-utils/ipcs.c:136
+#: sys-utils/ipcs.c:135
msgid "-i id [-s -q -m] : details on resource identified by id\n"
msgstr ""
"-i id [-s -q -m] : información detallada sobre los recursos identificados "
"por id\n"
-#: sys-utils/ipcs.c:268
+#: sys-utils/ipcs.c:267
msgid "kernel not configured for shared memory\n"
msgstr "el núcleo no está configurado para memoria compartida\n"
-#: sys-utils/ipcs.c:274
+#: sys-utils/ipcs.c:273
msgid "------ Shared Memory Limits --------\n"
msgstr "---- Límites memoria compartida ----\n"
#. glibc 2.1.3 and all earlier libc's have ints as fields
#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
-#: sys-utils/ipcs.c:279
+#: sys-utils/ipcs.c:278
#, c-format
msgid "max number of segments = %ld\n"
msgstr "número máx. segmentos = %ld\n"
-#: sys-utils/ipcs.c:281
+#: sys-utils/ipcs.c:280
#, c-format
msgid "max seg size (kbytes) = %ld\n"
msgstr "tamaño máx. segmento (kbytes) = %ld\n"
-#: sys-utils/ipcs.c:283
+#: sys-utils/ipcs.c:282
#, c-format
msgid "max total shared memory (kbytes) = %ld\n"
msgstr "total máx. memoria compartida (kbytes) = %ld\n"
-#: sys-utils/ipcs.c:285
+#: sys-utils/ipcs.c:284
#, c-format
msgid "min seg size (bytes) = %ld\n"
msgstr "tamaño mín. segmento (bytes) = %ld\n"
-#: sys-utils/ipcs.c:290
+#: sys-utils/ipcs.c:289
msgid "------ Shared Memory Status --------\n"
msgstr "----- Estado memoria compartida ----\n"
-#: sys-utils/ipcs.c:291
+#: sys-utils/ipcs.c:290
#, c-format
msgid "segments allocated %d\n"
msgstr "segmentos asignados %d\n"
-#: sys-utils/ipcs.c:292
+#: sys-utils/ipcs.c:291
#, c-format
msgid "pages allocated %ld\n"
msgstr "páginas asignadas %ld\n"
-#: sys-utils/ipcs.c:293
+#: sys-utils/ipcs.c:292
#, c-format
msgid "pages resident %ld\n"
msgstr "páginas residentes %ld\n"
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:293
#, c-format
msgid "pages swapped %ld\n"
msgstr "páginas intercambiadas %ld\n"
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:294
#, c-format
msgid "Swap performance: %ld attempts\t %ld successes\n"
msgstr "Rendimiento de intercambio: %ld intentos\t %ld correctos\n"
-#: sys-utils/ipcs.c:300
+#: sys-utils/ipcs.c:299
msgid "------ Shared Memory Segment Creators/Owners --------\n"
msgstr "-- Creadores/propietarios segmento mem. compartida --\n"
-#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:300 sys-utils/ipcs.c:417 sys-utils/ipcs.c:516
#, c-format
msgid "%-10s %-10s %-10s %-10s %-10s %-10s\n"
msgstr "%-10s %-10s %-10s %-10s %-10s %-10s\n"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:308 sys-utils/ipcs.c:315
-#: sys-utils/ipcs.c:321 sys-utils/ipcs.c:425
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:307 sys-utils/ipcs.c:314
+#: sys-utils/ipcs.c:320 sys-utils/ipcs.c:424
msgid "shmid"
msgstr "shmid"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:321 sys-utils/ipcs.c:419
-#: sys-utils/ipcs.c:434 sys-utils/ipcs.c:519 sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:320 sys-utils/ipcs.c:418
+#: sys-utils/ipcs.c:433 sys-utils/ipcs.c:517 sys-utils/ipcs.c:535
msgid "perms"
msgstr "perms"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:517
msgid "cuid"
msgstr "cuid"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:517
msgid "cgid"
msgstr "cgid"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:517
msgid "uid"
msgstr "uid"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:517
msgid "gid"
msgstr "gid"
-#: sys-utils/ipcs.c:306
+#: sys-utils/ipcs.c:305
msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
msgstr "-- Tiempos conexión/desconexión/modificac. mem. comp. --\n"
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:306
#, c-format
msgid "%-10s %-10s %-20s %-20s %-20s\n"
msgstr "%-10s %-10s %-20s %-20s %-20s\n"
-#: sys-utils/ipcs.c:308 sys-utils/ipcs.c:315 sys-utils/ipcs.c:321
-#: sys-utils/ipcs.c:425 sys-utils/ipcs.c:434 sys-utils/ipcs.c:525
-#: sys-utils/ipcs.c:531 sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:314 sys-utils/ipcs.c:320
+#: sys-utils/ipcs.c:424 sys-utils/ipcs.c:433 sys-utils/ipcs.c:523
+#: sys-utils/ipcs.c:529 sys-utils/ipcs.c:535
msgid "owner"
msgstr "propietario"
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:307
msgid "attached"
msgstr "conectado"
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:307
msgid "detached"
msgstr "desconectado"
-#: sys-utils/ipcs.c:309
+#: sys-utils/ipcs.c:308
msgid "changed"
msgstr "modificado"
-#: sys-utils/ipcs.c:313
+#: sys-utils/ipcs.c:312
msgid "------ Shared Memory Creator/Last-op --------\n"
msgstr "---- Creador/último op. memoria compart. ----\n"
-#: sys-utils/ipcs.c:314 sys-utils/ipcs.c:530
+#: sys-utils/ipcs.c:313 sys-utils/ipcs.c:528
#, c-format
msgid "%-10s %-10s %-10s %-10s\n"
msgstr "%-10s %-10s %-10s %-10s\n"
-#: sys-utils/ipcs.c:315
+#: sys-utils/ipcs.c:314
msgid "cpid"
msgstr "cpid"
-#: sys-utils/ipcs.c:315
+#: sys-utils/ipcs.c:314
msgid "lpid"
msgstr "lpid"
-#: sys-utils/ipcs.c:319
+#: sys-utils/ipcs.c:318
msgid "------ Shared Memory Segments --------\n"
msgstr "---- Segmentos memoria compartida ----\n"
-#: sys-utils/ipcs.c:320
+#: sys-utils/ipcs.c:319
#, c-format
msgid "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n"
msgstr "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n"
-#: sys-utils/ipcs.c:321 sys-utils/ipcs.c:434 sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:320 sys-utils/ipcs.c:433 sys-utils/ipcs.c:535
msgid "key"
msgstr "key"
-#: sys-utils/ipcs.c:321
+#: sys-utils/ipcs.c:320
msgid "bytes"
msgstr "bytes"
-#: sys-utils/ipcs.c:322
+#: sys-utils/ipcs.c:321
msgid "nattch"
msgstr "nattch"
-#: sys-utils/ipcs.c:322 sys-utils/ipcs.c:435
+#: sys-utils/ipcs.c:321
msgid "status"
msgstr "estado"
-#: sys-utils/ipcs.c:343 sys-utils/ipcs.c:345 sys-utils/ipcs.c:347
-#: sys-utils/ipcs.c:456 sys-utils/ipcs.c:458 sys-utils/ipcs.c:558
-#: sys-utils/ipcs.c:560 sys-utils/ipcs.c:562 sys-utils/ipcs.c:615
-#: sys-utils/ipcs.c:617 sys-utils/ipcs.c:646 sys-utils/ipcs.c:648
-#: sys-utils/ipcs.c:650 sys-utils/ipcs.c:674
+#: sys-utils/ipcs.c:342 sys-utils/ipcs.c:344 sys-utils/ipcs.c:346
+#: sys-utils/ipcs.c:455 sys-utils/ipcs.c:457 sys-utils/ipcs.c:556
+#: sys-utils/ipcs.c:558 sys-utils/ipcs.c:560 sys-utils/ipcs.c:613
+#: sys-utils/ipcs.c:615 sys-utils/ipcs.c:644 sys-utils/ipcs.c:646
+#: sys-utils/ipcs.c:648 sys-utils/ipcs.c:672
msgid "Not set"
msgstr "No establecido"
-#: sys-utils/ipcs.c:372
+#: sys-utils/ipcs.c:371
msgid "dest"
msgstr "dest"
-#: sys-utils/ipcs.c:373
+#: sys-utils/ipcs.c:372
msgid "locked"
msgstr "bloqueado"
-#: sys-utils/ipcs.c:393
+#: sys-utils/ipcs.c:392
msgid "kernel not configured for semaphores\n"
msgstr "el núcleo no está configurado para semáforos\n"
-#: sys-utils/ipcs.c:399
+#: sys-utils/ipcs.c:398
msgid "------ Semaphore Limits --------\n"
msgstr "------ Límites semáforo --------\n"
-#: sys-utils/ipcs.c:403
+#: sys-utils/ipcs.c:402
#, c-format
msgid "max number of arrays = %d\n"
msgstr "número máximo de matrices = %d\n"
-#: sys-utils/ipcs.c:404
+#: sys-utils/ipcs.c:403
#, c-format
msgid "max semaphores per array = %d\n"
msgstr "máx. semáforos por matriz = %d\n"
-#: sys-utils/ipcs.c:405
+#: sys-utils/ipcs.c:404
#, c-format
msgid "max semaphores system wide = %d\n"
msgstr "máx. semáforos sistema = %d\n"
-#: sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:405
#, c-format
msgid "max ops per semop call = %d\n"
msgstr "máx. oper. por llamada semop = %d\n"
-#: sys-utils/ipcs.c:407
+#: sys-utils/ipcs.c:406
#, c-format
msgid "semaphore max value = %d\n"
msgstr "valor máx. semáforo = %d\n"
-#: sys-utils/ipcs.c:411
+#: sys-utils/ipcs.c:410
msgid "------ Semaphore Status --------\n"
msgstr "------ Estado semáforo ---------\n"
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:411
#, c-format
msgid "used arrays = %d\n"
msgstr "matrices utilizadas = %d\n"
-#: sys-utils/ipcs.c:413
+#: sys-utils/ipcs.c:412
#, c-format
msgid "allocated semaphores = %d\n"
msgstr "semáforos asignados = %d\n"
-#: sys-utils/ipcs.c:417
+#: sys-utils/ipcs.c:416
msgid "------ Semaphore Arrays Creators/Owners --------\n"
msgstr "---- Creadores/propietarios matrices semáf. ----\n"
-#: sys-utils/ipcs.c:419 sys-utils/ipcs.c:434
+#: sys-utils/ipcs.c:418 sys-utils/ipcs.c:433
msgid "semid"
msgstr "semid"
-#: sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:422
msgid "------ Shared Memory Operation/Change Times --------\n"
msgstr "--- Tiempos operación/modificación memoria comp. ---\n"
-#: sys-utils/ipcs.c:424
+#: sys-utils/ipcs.c:423
#, c-format
msgid "%-8s %-10s %-26.24s %-26.24s\n"
msgstr "%-8s %-10s %-26.24s %-26.24s\n"
-#: sys-utils/ipcs.c:425
+#: sys-utils/ipcs.c:424
msgid "last-op"
msgstr "última operación"
-#: sys-utils/ipcs.c:425
+#: sys-utils/ipcs.c:424
msgid "last-changed"
msgstr "última modificación"
-#: sys-utils/ipcs.c:432
+#: sys-utils/ipcs.c:431
msgid "------ Semaphore Arrays --------\n"
msgstr "------ Matrices semáforo -------\n"
-#: sys-utils/ipcs.c:433
+#: sys-utils/ipcs.c:432 sys-utils/ipcs.c:675
#, c-format
-msgid "%-10s %-10s %-10s %-10s %-10s %-12s\n"
-msgstr "%-10s %-10s %-10s %-10s %-10s %-12s\n"
+msgid "%-10s %-10s %-10s %-10s %-10s\n"
+msgstr "%-10s %-10s %-10s %-10s %-10s\n"
-#: sys-utils/ipcs.c:435
+#: sys-utils/ipcs.c:434
msgid "nsems"
msgstr "nsems"
-#: sys-utils/ipcs.c:495
+#: sys-utils/ipcs.c:493
msgid "kernel not configured for message queues\n"
msgstr "el núcleo no está configurado para colas de mensajes\n"
-#: sys-utils/ipcs.c:503
+#: sys-utils/ipcs.c:501
msgid "------ Messages: Limits --------\n"
msgstr "------ Mensajes: límites -------\n"
-#: sys-utils/ipcs.c:504
+#: sys-utils/ipcs.c:502
#, c-format
msgid "max queues system wide = %d\n"
msgstr "máx. colas sistema = %d\n"
-#: sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:503
#, c-format
msgid "max size of message (bytes) = %d\n"
msgstr "tamaño máx. mensaje (bytes) = %d\n"
-#: sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:504
#, c-format
msgid "default max size of queue (bytes) = %d\n"
msgstr "tamaño máx. predeterminado cola (bytes) = %d\n"
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:508
msgid "------ Messages: Status --------\n"
msgstr "------ Mensajes: estado --------\n"
-#: sys-utils/ipcs.c:511
+#: sys-utils/ipcs.c:509
#, c-format
msgid "allocated queues = %d\n"
msgstr "colas asignadas = %d\n"
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:510
#, c-format
msgid "used headers = %d\n"
msgstr "cabeceras utilizadas = %d\n"
-#: sys-utils/ipcs.c:513
+#: sys-utils/ipcs.c:511
#, c-format
msgid "used space = %d bytes\n"
msgstr "espacio utilizado = %d bytes\n"
-#: sys-utils/ipcs.c:517
+#: sys-utils/ipcs.c:515
msgid "------ Message Queues: Creators/Owners --------\n"
msgstr "-- Colas de mensajes: creadores/propietarios --\n"
-#: sys-utils/ipcs.c:519 sys-utils/ipcs.c:525 sys-utils/ipcs.c:531
-#: sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:517 sys-utils/ipcs.c:523 sys-utils/ipcs.c:529
+#: sys-utils/ipcs.c:535
msgid "msqid"
msgstr "msqid"
-#: sys-utils/ipcs.c:523
+#: sys-utils/ipcs.c:521
msgid "------ Message Queues Send/Recv/Change Times --------\n"
msgstr "--- Tiempos envío/recep./modific. colas mensajes ----\n"
-#: sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:522
#, c-format
msgid "%-8s %-10s %-20s %-20s %-20s\n"
msgstr "%-8s %-10s %-20s %-20s %-20s\n"
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:523
msgid "send"
msgstr "envío"
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:523
msgid "recv"
msgstr "recepción"
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:523
msgid "change"
msgstr "modificación"
-#: sys-utils/ipcs.c:529
+#: sys-utils/ipcs.c:527
msgid "------ Message Queues PIDs --------\n"
msgstr "----- PID de colas de mensajes ----\n"
-#: sys-utils/ipcs.c:531
+#: sys-utils/ipcs.c:529
msgid "lspid"
msgstr "lspid"
-#: sys-utils/ipcs.c:531
+#: sys-utils/ipcs.c:529
msgid "lrpid"
msgstr "lrpid"
-#: sys-utils/ipcs.c:535
+#: sys-utils/ipcs.c:533
msgid "------ Message Queues --------\n"
msgstr "------ Colas de mensajes -----\n"
-#: sys-utils/ipcs.c:536
+#: sys-utils/ipcs.c:534
#, c-format
msgid "%-10s %-10s %-10s %-10s %-12s %-12s\n"
msgstr "%-10s %-10s %-10s %-10s %-12s %-12s\n"
-#: sys-utils/ipcs.c:538
+#: sys-utils/ipcs.c:536
msgid "used-bytes"
msgstr "bytes utilizados"
-#: sys-utils/ipcs.c:538
+#: sys-utils/ipcs.c:536
msgid "messages"
msgstr "mensajes"
-#: sys-utils/ipcs.c:606
+#: sys-utils/ipcs.c:604
#, c-format
msgid ""
"\n"
@@ -8914,37 +9138,37 @@ msgstr ""
"\n"
"Segmento de memoria compartida shmid=%d\n"
-#: sys-utils/ipcs.c:607
+#: sys-utils/ipcs.c:605
#, c-format
msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
-#: sys-utils/ipcs.c:609
+#: sys-utils/ipcs.c:607
#, c-format
msgid "mode=%#o\taccess_perms=%#o\n"
msgstr "mode=%#o\taccess_perms=%#o\n"
-#: sys-utils/ipcs.c:611
+#: sys-utils/ipcs.c:609
#, c-format
msgid "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n"
msgstr "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n"
-#: sys-utils/ipcs.c:614
+#: sys-utils/ipcs.c:612
#, c-format
msgid "att_time=%-26.24s\n"
msgstr "att_time=%-26.24s\n"
-#: sys-utils/ipcs.c:616
+#: sys-utils/ipcs.c:614
#, c-format
msgid "det_time=%-26.24s\n"
msgstr "det_time=%-26.24s\n"
-#: sys-utils/ipcs.c:618 sys-utils/ipcs.c:649
+#: sys-utils/ipcs.c:616 sys-utils/ipcs.c:647
#, c-format
msgid "change_time=%-26.24s\n"
msgstr "change_time=%-26.24s\n"
-#: sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:631
#, c-format
msgid ""
"\n"
@@ -8953,27 +9177,27 @@ msgstr ""
"\n"
"Cola de mensajes msqid=%d\n"
-#: sys-utils/ipcs.c:634
+#: sys-utils/ipcs.c:632
#, c-format
msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
-#: sys-utils/ipcs.c:636
+#: sys-utils/ipcs.c:634
#, c-format
msgid "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
msgstr "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
-#: sys-utils/ipcs.c:645
+#: sys-utils/ipcs.c:643
#, c-format
msgid "send_time=%-26.24s\n"
msgstr "send_time=%-26.24s\n"
-#: sys-utils/ipcs.c:647
+#: sys-utils/ipcs.c:645
#, c-format
msgid "rcv_time=%-26.24s\n"
msgstr "rcv_time=%-26.24s\n"
-#: sys-utils/ipcs.c:667
+#: sys-utils/ipcs.c:665
#, c-format
msgid ""
"\n"
@@ -8982,53 +9206,48 @@ msgstr ""
"\n"
"semid de matriz de semáforos=%d\n"
-#: sys-utils/ipcs.c:668
+#: sys-utils/ipcs.c:666
#, c-format
msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
msgstr "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
-#: sys-utils/ipcs.c:670
+#: sys-utils/ipcs.c:668
#, c-format
msgid "mode=%#o, access_perms=%#o\n"
msgstr "mode=%#o, access_perms=%#o\n"
-#: sys-utils/ipcs.c:672
+#: sys-utils/ipcs.c:670
#, c-format
msgid "nsems = %ld\n"
msgstr "nsems = %ld\n"
-#: sys-utils/ipcs.c:673
+#: sys-utils/ipcs.c:671
#, c-format
msgid "otime = %-26.24s\n"
msgstr "otime = %-26.24s\n"
-#: sys-utils/ipcs.c:675
+#: sys-utils/ipcs.c:673
#, c-format
msgid "ctime = %-26.24s\n"
msgstr "ctime = %-26.24s\n"
-#: sys-utils/ipcs.c:677
-#, c-format
-msgid "%-10s %-10s %-10s %-10s %-10s\n"
-msgstr "%-10s %-10s %-10s %-10s %-10s\n"
-
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "semnum"
msgstr "semnum"
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "value"
msgstr "value"
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "ncount"
msgstr "ncount"
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "zcount"
msgstr "zcount"
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "pid"
msgstr "pid"
@@ -9284,11 +9503,11 @@ msgstr "-- línea ya vaciada"
msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
msgstr "uso: %s [ - ] [ -2 ] [ fichero ... ]\n"
-#: text-utils/column.c:298
+#: text-utils/column.c:297
msgid "line too long"
msgstr "línea demasiado larga"
-#: text-utils/column.c:375
+#: text-utils/column.c:374
msgid "usage: column [-tx] [-c columns] [file ...]\n"
msgstr "uso: column [-tx] [-c columnas] [fichero ...]\n"
@@ -9380,33 +9599,33 @@ msgstr ""
msgid "Can't open help file"
msgstr "No se puede abrir el fichero"
-#: text-utils/more.c:1442 text-utils/more.c:1446
+#: text-utils/more.c:1442 text-utils/more.c:1447
msgid "[Press 'h' for instructions.]"
msgstr "[Pulse 'h' para consultar las instrucciones.]"
-#: text-utils/more.c:1480
+#: text-utils/more.c:1481
#, c-format
msgid "\"%s\" line %d"
msgstr "\"%s\" línea %d"
-#: text-utils/more.c:1482
+#: text-utils/more.c:1483
#, c-format
msgid "[Not a file] line %d"
msgstr "[No es un fichero] línea %d"
-#: text-utils/more.c:1566
+#: text-utils/more.c:1567
msgid " Overflow\n"
msgstr " Desbordamiento\n"
-#: text-utils/more.c:1613
+#: text-utils/more.c:1614
msgid "...skipping\n"
msgstr "...omitiendo\n"
-#: text-utils/more.c:1643
+#: text-utils/more.c:1644
msgid "Regular expression botch"
msgstr "Error en expresión regular"
-#: text-utils/more.c:1655
+#: text-utils/more.c:1656
msgid ""
"\n"
"Pattern not found\n"
@@ -9414,15 +9633,15 @@ msgstr ""
"\n"
"Patrón no encontrado\n"
-#: text-utils/more.c:1658
+#: text-utils/more.c:1659 text-utils/pg.c:1134 text-utils/pg.c:1285
msgid "Pattern not found"
msgstr "Patrón no encontrado"
-#: text-utils/more.c:1719
+#: text-utils/more.c:1720
msgid "can't fork\n"
msgstr "no se puede bifurcar\n"
-#: text-utils/more.c:1758
+#: text-utils/more.c:1759
msgid ""
"\n"
"...Skipping "
@@ -9430,19 +9649,19 @@ msgstr ""
"\n"
"...Saltando "
-#: text-utils/more.c:1763
+#: text-utils/more.c:1764
msgid "...Skipping to file "
msgstr "...Saltando al fichero "
-#: text-utils/more.c:1765
+#: text-utils/more.c:1766
msgid "...Skipping back to file "
msgstr "...Retrocediendo al fichero "
-#: text-utils/more.c:2046
+#: text-utils/more.c:2047
msgid "Line too long"
msgstr "Línea demasiado larga"
-#: text-utils/more.c:2089
+#: text-utils/more.c:2090
msgid "No previous command to substitute for"
msgstr "No hay ningún comando anterior para sustituir"
@@ -9494,6 +9713,102 @@ msgstr "hexdump: formato incorrecto {%s}\n"
msgid "hexdump: bad conversion character %%%s.\n"
msgstr "hexdump: carácter de conversión %%%s incorrecto.\n"
+#: text-utils/pg.c:246
+#, c-format
+msgid ""
+"%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
+msgstr ""
+
+#: text-utils/pg.c:255
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- %s\n"
+msgstr "La opción `%s' necesita un argumento\n"
+
+#: text-utils/pg.c:263
+#, fuzzy, c-format
+msgid "%s: illegal option -- %s\n"
+msgstr "%s: opción ilegal -- %c\n"
+
+#: text-utils/pg.c:380
+#, fuzzy
+msgid "...skipping forward\n"
+msgstr "...omitiendo\n"
+
+#: text-utils/pg.c:382
+#, fuzzy
+msgid "...skipping backward\n"
+msgstr "...omitiendo\n"
+
+#: text-utils/pg.c:404
+#, fuzzy
+msgid "No next file"
+msgstr "(Siguiente fichero: %s)"
+
+#: text-utils/pg.c:408
+#, fuzzy
+msgid "No previous file"
+msgstr "No hay ninguna partición definida\n"
+
+#: text-utils/pg.c:938
+#, fuzzy, c-format
+msgid "%s: Read error from %s file\n"
+msgstr "%s: error de lectura en %s\n"
+
+#.
+#. * Most likely '\0' in input.
+#.
+#: text-utils/pg.c:944
+#, c-format
+msgid "%s: Unexpected EOF in %s file\n"
+msgstr ""
+
+#: text-utils/pg.c:947
+#, fuzzy, c-format
+msgid "%s: Unknown error in %s file\n"
+msgstr "error desconocido en el identificador"
+
+#: text-utils/pg.c:1042
+#, fuzzy, c-format
+msgid "%s: Cannot create tempfile\n"
+msgstr "%s: no se puede leer el fichero temporal.\n"
+
+#: text-utils/pg.c:1051 text-utils/pg.c:1226
+#, fuzzy
+msgid "RE error: "
+msgstr ", error"
+
+#: text-utils/pg.c:1208
+msgid "(EOF)"
+msgstr ""
+
+#: text-utils/pg.c:1234
+msgid "No remembered search string"
+msgstr ""
+
+#: text-utils/pg.c:1317
+#, fuzzy
+msgid "Cannot open "
+msgstr "No se puede abrir %s\n"
+
+#: text-utils/pg.c:1365
+#, fuzzy
+msgid "saved"
+msgstr "envío"
+
+#: text-utils/pg.c:1472
+msgid ": !command not allowed in rflag mode.\n"
+msgstr ""
+
+#: text-utils/pg.c:1504
+#, fuzzy
+msgid "fork() failed, try again later\n"
+msgstr "*NO* se ha cambiado la contraseña. Inténtelo de nuevo más adelante.\n"
+
+#: text-utils/pg.c:1709
+#, fuzzy
+msgid "(Next file: "
+msgstr "(Siguiente fichero: %s)"
+
#: text-utils/rev.c:113
msgid "Unable to allocate bufferspace\n"
msgstr "No se puede asignar espacio de búfer\n"
@@ -9528,6 +9843,27 @@ msgstr "Línea de entrada demasiado larga.\n"
msgid "Out of memory when growing buffer.\n"
msgstr "No queda memoria al aumentar el tamaño del búfer.\n"
+#~ msgid "invalid number `%s'\n"
+#~ msgstr "Número `%s' inválido\n"
+
+#~ msgid "number `%s' to `%s' out of range\n"
+#~ msgstr "El número de `%s' a `%s' está fuera de rango\n"
+
+#~ msgid "unrecognized option `%s'\n"
+#~ msgstr "Opción `%s' no reconocida\n"
+
+#~ msgid "option `%s' requires an argument\n"
+#~ msgstr "La opción `%s' necesita un argumento\n"
+
+#~ msgid "option `%s' doesn't allow an argument\n"
+#~ msgstr "La opción `%s' no admite ningún argumento\n"
+
+#~ msgid "unrecognized option `-%c'\n"
+#~ msgstr "Opción `-%c' no reconocida\n"
+
+#~ msgid "%-10s %-10s %-10s %-10s %-10s %-12s\n"
+#~ msgstr "%-10s %-10s %-10s %-10s %-10s %-12s\n"
+
#~ msgid "umount: only %s can unmount %s from %s"
#~ msgstr "umount: sólo %s puede desmontar %s desde %s"
@@ -9669,9 +10005,6 @@ msgstr "No queda memoria al aumentar el tamaño del búfer.\n"
#~ msgid "not mounted anything"
#~ msgstr "No se ha montado nada"
-#~ msgid "Not set\n"
-#~ msgstr "No establecido\n"
-
#~ msgid "send_time=%srcv_time=%schange_time=%s"
#~ msgstr "send_time=%srcv_time=%schange_time=%s"
diff --git a/po/et.po b/po/et.po
index 09d33978e..31b0aa8c5 100644
--- a/po/et.po
+++ b/po/et.po
@@ -1,7 +1,7 @@
# Estonian translations for util-linux
-# Copyright (C) 2001 Free Software Foundation, Inc.
-# Copyright (C) 2001 Meelis Roos <mroos@linux.ee>
-# Meelis Roos <mroos@linux.ee>, 2001
+# Copyright (C) 2002 Free Software Foundation, Inc.
+# Copyright (C) 2002 Meelis Roos <mroos@linux.ee>
+# Meelis Roos <mroos@linux.ee>, 2002
#
# Permission is granted to freely copy and distribute
# this file and modified versions, provided that this
@@ -10,9 +10,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: util-linux 2.11q\n"
-"POT-Creation-Date: 2002-05-09 02:51+0200\n"
-"PO-Revision-Date: 2002-04-11 19:10+0300\n"
+"Project-Id-Version: util-linux 2.11r\n"
+"POT-Creation-Date: 2002-07-07 17:03+0200\n"
+"PO-Revision-Date: 2002-05-19 20:04GMT+0300\n"
"Last-Translator: Meelis Roos <mroos@linux.ee>\n"
"Language-Team: Estonian <et@li.org>\n"
"MIME-Version: 1.0\n"
@@ -114,28 +114,28 @@ msgstr ""
msgid "usage:\n"
msgstr "Kasutamine:\n"
-#: disk-utils/fdformat.c:35
+#: disk-utils/fdformat.c:31
msgid "Formatting ... "
msgstr "Formaadin ... "
-#: disk-utils/fdformat.c:53 disk-utils/fdformat.c:88
+#: disk-utils/fdformat.c:49 disk-utils/fdformat.c:84
msgid "done\n"
msgstr "valmis\n"
-#: disk-utils/fdformat.c:64
+#: disk-utils/fdformat.c:60
msgid "Verifying ... "
msgstr "Kontrollin ... "
-#: disk-utils/fdformat.c:75
+#: disk-utils/fdformat.c:71
msgid "Read: "
msgstr "read: "
-#: disk-utils/fdformat.c:77
+#: disk-utils/fdformat.c:73
#, c-format
msgid "Problem reading cylinder %d, expected %d, read %d\n"
msgstr "Probleem silindrilt %d lugemisel, lootsin %d, sain %d\n"
-#: disk-utils/fdformat.c:83
+#: disk-utils/fdformat.c:79
#, c-format
msgid ""
"bad data in cyl %d\n"
@@ -144,42 +144,148 @@ msgstr ""
"Halvad andmed silindril %d\n"
"Jätkan ... "
-#: disk-utils/fdformat.c:98
+#: disk-utils/fdformat.c:94
#, c-format
msgid "usage: %s [ -n ] device\n"
msgstr "Kasutamine: %s [ -n ] seade\n"
-#: disk-utils/fdformat.c:120 disk-utils/fsck.minix.c:1291
+#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1291
#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:55
-#: disk-utils/mkfs.minix.c:644 disk-utils/mkswap.c:457
-#: disk-utils/setfdprm.c:128 misc-utils/cal.c:246 misc-utils/ddate.c:181
-#: misc-utils/kill.c:188 misc-utils/rename.c:79 misc-utils/script.c:132
+#: disk-utils/mkfs.cramfs.c:665 disk-utils/mkfs.minix.c:644
+#: disk-utils/mkswap.c:457 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1170
+#: misc-utils/cal.c:246 misc-utils/ddate.c:181 misc-utils/kill.c:188
+#: misc-utils/rename.c:79 misc-utils/script.c:132
#, c-format
msgid "%s from %s\n"
msgstr "%s paketist %s\n"
-#: disk-utils/fdformat.c:134
-#, c-format
-msgid "%s: not a floppy device\n"
+#: disk-utils/fdformat.c:130
+#, fuzzy, c-format
+msgid "%s: not a block device\n"
msgstr "%s pole flopiseade\n"
-#: disk-utils/fdformat.c:143
+#: disk-utils/fdformat.c:140
msgid "Could not determine current format type"
msgstr "Ei suuda kindlaks teha formaatimise parameetreid"
-#: disk-utils/fdformat.c:144
+#: disk-utils/fdformat.c:141
#, c-format
msgid "%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n"
msgstr "%spoolne, %d rada, %d sektorit rajal. Kogumaht %d kB\n"
-#: disk-utils/fdformat.c:145
+#: disk-utils/fdformat.c:142
msgid "Double"
msgstr "Kahe"
-#: disk-utils/fdformat.c:145
+#: disk-utils/fdformat.c:142
msgid "Single"
msgstr "Ühe"
+#: disk-utils/fsck.cramfs.c:98
+#, c-format
+msgid ""
+"usage: %s [-hv] [-x dir] file\n"
+" -h print this help\n"
+" -x dir extract into dir\n"
+" -v be more verbose\n"
+" file file to test\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:191
+#, c-format
+msgid "%s: error %d while decompressing! %p(%d)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:243
+#, fuzzy, c-format
+msgid "%s: size error in symlink `%s'\n"
+msgstr "%s: seekimise viga failis %s\n"
+
+#: disk-utils/fsck.cramfs.c:258 disk-utils/fsck.cramfs.c:328
+#, c-format
+msgid " uncompressing block at %ld to %ld (%ld)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:287
+#, c-format
+msgid "%s: bogus mode on `%s' (%o)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:319
+#, fuzzy, c-format
+msgid " hole at %ld (%d)\n"
+msgstr "peaks olema (%d, %d, %d)\n"
+
+#: disk-utils/fsck.cramfs.c:337
+#, c-format
+msgid "%s: Non-block (%ld) bytes\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:343
+#, c-format
+msgid "%s: Non-size (%ld vs %ld) bytes\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:392
+#, c-format
+msgid "%s: invalid cramfs--bad path length\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:472
+#, fuzzy, c-format
+msgid "%s: compiled without -x support\n"
+msgstr "%s pole kompileeritud minix v2 toega\n"
+
+#: disk-utils/fsck.cramfs.c:498
+#, c-format
+msgid "%s: warning--unable to determine filesystem size \n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:508
+#, fuzzy, c-format
+msgid "%s is not a block device or file\n"
+msgstr "%s pole flopiseade\n"
+
+#: disk-utils/fsck.cramfs.c:514 disk-utils/fsck.cramfs.c:549
+#, c-format
+msgid "%s: invalid cramfs--file length too short\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:541
+#, c-format
+msgid "%s: invalid cramfs--wrong magic\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:554
+#, c-format
+msgid "%s: warning--file length too long, padded image?\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:564
+#, fuzzy, c-format
+msgid "%s: invalid cramfs--crc error\n"
+msgstr "%s: viga võtmete analüüsimisel\n"
+
+#: disk-utils/fsck.cramfs.c:570
+#, c-format
+msgid "%s: warning--old cramfs image, no CRC\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:592
+#, c-format
+msgid "%s: invalid cramfs--bad superblock\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:608
+#, c-format
+msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:616
+#, c-format
+msgid "%s: invalid cramfs--invalid file data offset\n"
+msgstr ""
+
#: disk-utils/fsck.minix.c:200
#, c-format
msgid "Usage: %s [-larvsmf] /dev/name\n"
@@ -646,7 +752,7 @@ msgstr "liiga palju i-kirjeid - maksimum on 512"
msgid "not enough space, need at least %lu blocks"
msgstr "pole piisavalt vaba ruumi, vaja oleks vähemalt %lu plokki"
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2057
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2069
#, c-format
msgid "Device: %s\n"
msgstr "Seade: %s\n"
@@ -730,6 +836,130 @@ msgstr "%s: Mälu sai otsa\n"
msgid "mkfs version %s (%s)\n"
msgstr "mkfs versioon %s (%s)\n"
+#: disk-utils/mkfs.cramfs.c:49
+#, c-format
+msgid ""
+"usage: %s [-h] [-v] [-e edition] [-i file] [-n name] dirname outfile\n"
+" -h print this help\n"
+" -v be verbose\n"
+" -E make all warnings errors (non-zero exit status)\n"
+" -e edition set edition number (part of fsid)\n"
+" -i file insert a file image into the filesystem (requires >= 2.4.0)\n"
+" -n name set name of cramfs filesystem\n"
+" -p pad by %d bytes for boot code\n"
+" -s sort directory entries (old option, ignored)\n"
+" -z make explicit holes (requires >= 2.3.39)\n"
+" dirname root of the filesystem to be compressed\n"
+" outfile output file\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:213
+#, c-format
+msgid ""
+"Very long (%u bytes) filename `%s' found.\n"
+" Please increase MAX_INPUT_NAMELEN in mkcramfs.c and recompile. Exiting.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:371
+msgid "filesystem too big. Exiting.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:422
+msgid ""
+"Exceeded MAXENTRIES. Raise this value in mkcramfs.c and recompile. "
+"Exiting.\n"
+msgstr ""
+
+#. (I don't think this can happen with zlib.)
+#: disk-utils/mkfs.cramfs.c:520
+#, c-format
+msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:537
+#, c-format
+msgid "%6.2f%% (%+d bytes)\t%s\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:705
+#, c-format
+msgid ""
+"warning: guestimate of required size (upper bound) is %LdMB, but maximum "
+"image size is %uMB. We might die prematurely.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:747
+#, fuzzy, c-format
+msgid "Including: %s\n"
+msgstr "Vigane arv: %s\n"
+
+#: disk-utils/mkfs.cramfs.c:753
+#, c-format
+msgid "Directory data: %d bytes\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:761
+#, c-format
+msgid "Everything: %d kilobytes\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:766
+#, c-format
+msgid "Super block: %d bytes\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:773
+#, c-format
+msgid "CRC: %x\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:778
+#, c-format
+msgid "not enough space allocated for ROM image (%Ld allocated, %d used)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:790
+#, c-format
+msgid "ROM image write failed (%d %d)\n"
+msgstr ""
+
+#. (These warnings used to come at the start, but they scroll off the
+#. screen too quickly.)
+#. (can't happen when reading from ext2fs)
+#. bytes, not chars: think UTF8.
+#: disk-utils/mkfs.cramfs.c:799
+#, fuzzy
+msgid "warning: filenames truncated to 255 bytes.\n"
+msgstr "Hoiatus: i-kirjete arv on liiga suur\n"
+
+#: disk-utils/mkfs.cramfs.c:802
+msgid "warning: files were skipped due to errors.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:805
+#, c-format
+msgid "warning: file sizes truncated to %luMB (minus 1 byte).\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:810
+#, c-format
+msgid ""
+"warning: uids truncated to %u bits. (This may be a security concern.)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:815
+#, c-format
+msgid ""
+"warning: gids truncated to %u bits. (This may be a security concern.)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:820
+#, c-format
+msgid ""
+"WARNING: device numbers truncated to %u bits. This almost certainly means\n"
+"that some device files will be wrong.\n"
+msgstr ""
+
#: disk-utils/mkfs.minix.c:181
#, c-format
msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
@@ -874,7 +1104,7 @@ msgid "too many bad pages"
msgstr "liiga palju vigaseid lehekülgi"
#: disk-utils/mkswap.c:359 misc-utils/look.c:182 misc-utils/setterm.c:1130
-#: text-utils/more.c:2062 text-utils/more.c:2073
+#: text-utils/more.c:2063 text-utils/more.c:2074
msgid "Out of memory"
msgstr "Mälu sai otsa"
@@ -940,9 +1170,9 @@ msgid "Unable to set up swap-space: unreadable"
msgstr "Ei suuda saalimisala tekitada: seade pole loetav"
#: disk-utils/mkswap.c:611
-#, fuzzy, c-format
+#, c-format
msgid "Setting up swapspace version %d, size = %lu KiB\n"
-msgstr "Tekitan saalimisala versiooniga %d, suurus = %lu baiti\n"
+msgstr "Tekitan saalimisala versiooniga %d, suurus = %lu KiB\n"
#: disk-utils/mkswap.c:617
msgid "unable to rewind swap-device"
@@ -1312,7 +1542,7 @@ msgstr " Loogiline"
#. odd flag on end
#. type id
#. type name
-#: fdisk/cfdisk.c:1996 fdisk/fdisk.c:1306 fdisk/fdisk.c:1594
+#: fdisk/cfdisk.c:1996 fdisk/fdisk.c:1318 fdisk/fdisk.c:1606
#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:690 fdisk/sfdisk.c:581
msgid "Unknown"
msgstr "Tundmatu"
@@ -1844,7 +2074,7 @@ msgstr ""
" sektorite arvud\n"
"\n"
-#: fdisk/fdisk.c:194
+#: fdisk/fdisk.c:195
msgid ""
"Usage: fdisk [-b SSZ] [-u] DISK Change partition table\n"
" fdisk -l [-b SSZ] [-u] DISK List partition table(s)\n"
@@ -1866,7 +2096,7 @@ msgstr ""
"-b 2048: kasutada 2048-baidiseid sektoreid (vajalik näiteks mõnel MO "
"seadmel)\n"
-#: fdisk/fdisk.c:206
+#: fdisk/fdisk.c:207
msgid ""
"Usage: fdisk [-l] [-b SSZ] [-u] device\n"
"E.g.: fdisk /dev/hda (for the first IDE disk)\n"
@@ -1883,222 +2113,222 @@ msgstr ""
"jaoks)\n"
" ...\n"
-#: fdisk/fdisk.c:215
+#: fdisk/fdisk.c:216
#, c-format
msgid "Unable to open %s\n"
msgstr "Ei suuda avada seadet %s\n"
-#: fdisk/fdisk.c:219
+#: fdisk/fdisk.c:220
#, c-format
msgid "Unable to read %s\n"
msgstr "Ei suuda lugeda seadet %s\n"
-#: fdisk/fdisk.c:223
+#: fdisk/fdisk.c:224
#, c-format
msgid "Unable to seek on %s\n"
msgstr "Ei suuda seekida seadmel %s\n"
-#: fdisk/fdisk.c:227
+#: fdisk/fdisk.c:228
#, c-format
msgid "Unable to write %s\n"
msgstr "Ei suuda kirjutada seadmele %s\n"
-#: fdisk/fdisk.c:231
+#: fdisk/fdisk.c:232
#, c-format
msgid "BLKGETSIZE ioctl failed on %s\n"
msgstr "BLKGETSIZE ioctl ei õnnestunud seadmel %s\n"
-#: fdisk/fdisk.c:235
+#: fdisk/fdisk.c:236
msgid "Unable to allocate any more memory\n"
msgstr "Mälu sai otsa\n"
-#: fdisk/fdisk.c:238
+#: fdisk/fdisk.c:239
msgid "Fatal error\n"
msgstr "Fataalne viga\n"
-#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:359 fdisk/fdisk.c:366
-#: fdisk/fdisk.c:389 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:439
-#: fdisk/fdiskbsdlabel.c:124
+#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:360 fdisk/fdisk.c:367
+#: fdisk/fdisk.c:390 fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:440
+#: fdisk/fdiskbsdlabel.c:129
msgid "Command action"
msgstr "Käsk Tähendus"
-#: fdisk/fdisk.c:323
+#: fdisk/fdisk.c:324
msgid " a toggle a read only flag"
msgstr " a lülitada kirjutuskaitse lipp sisse/välja"
#. sun
-#: fdisk/fdisk.c:324 fdisk/fdisk.c:368
+#: fdisk/fdisk.c:325 fdisk/fdisk.c:369
msgid " b edit bsd disklabel"
msgstr " b redigeerida NSD partitsioonitabelit"
-#: fdisk/fdisk.c:325
+#: fdisk/fdisk.c:326
msgid " c toggle the mountable flag"
msgstr " c lülitada monteeritavuse lipp sisse/välja"
#. sun
-#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:370
+#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:371
msgid " d delete a partition"
msgstr " d kustutada partitsioon"
-#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:371
+#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:372
msgid " l list known partition types"
msgstr " l anda nimekiri tuntud partitsioonitüüpidest"
#. sun
-#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:360 fdisk/fdisk.c:372
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
-#: fdisk/fdiskbsdlabel.c:129
+#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:361 fdisk/fdisk.c:373
+#: fdisk/fdisk.c:398 fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
+#: fdisk/fdiskbsdlabel.c:134
msgid " m print this menu"
msgstr " m näidata sedasama menüüd"
-#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
+#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374
msgid " n add a new partition"
msgstr " n lisada uus partitsioon"
-#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:361 fdisk/fdisk.c:374
+#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:362 fdisk/fdisk.c:375
msgid " o create a new empty DOS partition table"
msgstr " o luua uus tühi DOSi partitsioonitabel"
-#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:375 fdisk/fdisk.c:398
-#: fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:376 fdisk/fdisk.c:399
+#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
msgid " p print the partition table"
msgstr " p näidata partitsioonitabelit"
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:362 fdisk/fdisk.c:376
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
-#: fdisk/fdiskbsdlabel.c:132
+#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:363 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:450
+#: fdisk/fdiskbsdlabel.c:137
msgid " q quit without saving changes"
msgstr " q väljuda salvetsamata"
-#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:363 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:364 fdisk/fdisk.c:378
msgid " s create a new empty Sun disklabel"
msgstr " s luua uus tühi Sun'i partitsioonitabel"
#. sun
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
msgid " t change a partition's system id"
msgstr " t muuta partitsiooni tüüpi"
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
msgid " u change display/entry units"
msgstr " u muuta sisestamise ja tabeli näitamise ühikuid"
-#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380 fdisk/fdisk.c:402
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:452
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381 fdisk/fdisk.c:403
+#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
msgid " v verify the partition table"
msgstr " v kontrollida partitsioonitabelit"
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381 fdisk/fdisk.c:403
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:382 fdisk/fdisk.c:404
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
msgid " w write table to disk and exit"
msgstr " w kirjutada tabel kettale ja väljuda"
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:383
msgid " x extra functionality (experts only)"
msgstr " x lisafunktsionaalsus (ainult ekspertidele)"
-#: fdisk/fdisk.c:342
+#: fdisk/fdisk.c:343
msgid " a select bootable partition"
msgstr " a valida buutiv partitsioon"
#. sgi flavour
-#: fdisk/fdisk.c:343
+#: fdisk/fdisk.c:344
msgid " b edit bootfile entry"
msgstr " b redigeerida buutfaili kirjet"
#. sgi
-#: fdisk/fdisk.c:344
+#: fdisk/fdisk.c:345
msgid " c select sgi swap partition"
msgstr " c valida SGI saalimispartitsioon"
-#: fdisk/fdisk.c:367
+#: fdisk/fdisk.c:368
msgid " a toggle a bootable flag"
msgstr " a lülitada buuditavuse lipp sisse/välja"
-#: fdisk/fdisk.c:369
+#: fdisk/fdisk.c:370
msgid " c toggle the dos compatibility flag"
msgstr " c lülitada DOSiga ühilduvuse rezhiim sisse/välja"
-#: fdisk/fdisk.c:390
+#: fdisk/fdisk.c:391
msgid " a change number of alternate cylinders"
msgstr " a muuta alternatiivsete silindrite arvu"
#. sun
-#: fdisk/fdisk.c:391 fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:441
+#: fdisk/fdisk.c:392 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
msgid " c change number of cylinders"
msgstr " c muuta silindrite arvu"
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:393 fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:443
msgid " d print the raw data in the partition table"
msgstr " d näidata partitsioonitabelit baidikaupa"
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:394
msgid " e change number of extra sectors per cylinder"
msgstr " e muuta lisasektorite arvu silindril"
#. sun
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:395 fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
msgid " h change number of heads"
msgstr " h muuta peade arvu"
-#: fdisk/fdisk.c:395
+#: fdisk/fdisk.c:396
msgid " i change interleave factor"
msgstr " i muuta interleave-tegurit"
#. sun
-#: fdisk/fdisk.c:396
+#: fdisk/fdisk.c:397
msgid " o change rotation speed (rpm)"
msgstr " o muuta pöörlemise kiirust (rpm)"
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:450
-#: fdisk/fdiskbsdlabel.c:133
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:451
+#: fdisk/fdiskbsdlabel.c:138
msgid " r return to main menu"
msgstr " r tagasi peamenüüsse"
-#: fdisk/fdisk.c:401 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:452
msgid " s change number of sectors/track"
msgstr " s muuta sektorite arvu rajal"
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:405
msgid " y change number of physical cylinders"
msgstr " y muuta füüsiliste silindrite arvu"
-#: fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:440
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:441
msgid " b move beginning of data in a partition"
msgstr " b liigutada andmete algust partitsioonis"
-#: fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:443
+#: fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:444
msgid " e list extended partitions"
msgstr " e näidata extended-partitsioonide nimekirja"
#. !sun
-#: fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
msgid " g create an IRIX (SGI) partition table"
msgstr " g luua IRIXi (SGI) partitsioonitabel"
#. !sun
-#: fdisk/fdisk.c:444
+#: fdisk/fdisk.c:445
msgid " f fix partition order"
msgstr " f parandada partitsioonide järjekord"
-#: fdisk/fdisk.c:561
+#: fdisk/fdisk.c:562
msgid "You must set"
msgstr "Te peate määrama, et eksisteerib nii-ja-nii-mitu"
-#: fdisk/fdisk.c:575
+#: fdisk/fdisk.c:576
msgid "heads"
msgstr "pead"
-#: fdisk/fdisk.c:577 fdisk/fdisk.c:1142 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:578 fdisk/fdisk.c:1154 fdisk/sfdisk.c:864
msgid "sectors"
msgstr "sektorit"
-#: fdisk/fdisk.c:579 fdisk/fdisk.c:1142 fdisk/fdiskbsdlabel.c:464
+#: fdisk/fdisk.c:580 fdisk/fdisk.c:1154 fdisk/fdiskbsdlabel.c:469
#: fdisk/sfdisk.c:864
msgid "cylinders"
msgstr "silindrit"
-#: fdisk/fdisk.c:583
+#: fdisk/fdisk.c:584
#, c-format
msgid ""
"%s%s.\n"
@@ -2107,11 +2337,11 @@ msgstr ""
"%s%s.\n"
"Te saate seda teha lisafunktsionaalsuse menüüst.\n"
-#: fdisk/fdisk.c:584
+#: fdisk/fdisk.c:585
msgid " and "
msgstr " ja "
-#: fdisk/fdisk.c:601
+#: fdisk/fdisk.c:602
#, c-format
msgid ""
"\n"
@@ -2130,26 +2360,26 @@ msgstr ""
"2) muude operatsioonisüsteemide buutimise ja partitsioneerimise\n"
"tarkvaraga (näiteks DOSi FDISK, OS/2 FDISK)\n"
-#: fdisk/fdisk.c:624
+#: fdisk/fdisk.c:625
msgid "Bad offset in primary extended partition\n"
msgstr "Vigane offset primaarses extended-partitsioonis\n"
-#: fdisk/fdisk.c:638
+#: fdisk/fdisk.c:639
#, c-format
msgid "Warning: deleting partitions after %d\n"
msgstr "Hoiatus: kustutan partitsioonid pärast %d\n"
-#: fdisk/fdisk.c:655
+#: fdisk/fdisk.c:656
#, c-format
msgid "Warning: extra link pointer in partition table %d\n"
msgstr "Hoiatus: üleliigne 'link pointer' partitsioonitabelis %d\n"
-#: fdisk/fdisk.c:663
+#: fdisk/fdisk.c:664
#, c-format
msgid "Warning: ignoring extra data in partition table %d\n"
msgstr "Hoiatus: ignoreerin üleliigseid andmeid partitsioonitabelis %d\n"
-#: fdisk/fdisk.c:708
+#: fdisk/fdisk.c:709
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"
@@ -2160,31 +2390,37 @@ msgstr ""
"kuni Te ise otsustate need kettale kirjutada. Pärast seda pole vana sisu\n"
"loomulikult enam taastatav.\n"
-#: fdisk/fdisk.c:752
+#: fdisk/fdisk.c:753
#, c-format
msgid "Note: sector size is %d (not %d)\n"
msgstr "Märkus: sektori suurus on %d (mitte %d)\n"
-#: fdisk/fdisk.c:870
+#: fdisk/fdisk.c:883
msgid "You will not be able to write the partition table.\n"
msgstr "Partitsioonitabelit ei saa salvestada\n"
-#: fdisk/fdisk.c:903
+#: fdisk/fdisk.c:914
+msgid ""
+"This disk has both DOS and BSD magic.\n"
+"Give the 'b' command to go to BSD mode.\n"
+msgstr ""
+
+#: fdisk/fdisk.c:924
msgid ""
"Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
"disklabel\n"
msgstr "Seade ei sisalda ei DOSi, Suni, SGI ega ODF partitsioonitabelit\n"
-#: fdisk/fdisk.c:920
+#: fdisk/fdisk.c:942
msgid "Internal error\n"
msgstr "Sisemine viga\n"
-#: fdisk/fdisk.c:942
+#: fdisk/fdisk.c:954
#, c-format
msgid "Ignoring extra extended partition %d\n"
msgstr "Ignoreerin lisa-extended partistsiooni %d\n"
-#: fdisk/fdisk.c:954
+#: fdisk/fdisk.c:966
#, c-format
msgid ""
"Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2193,7 +2429,7 @@ msgstr ""
"Hoiatus: vigane lipp 0x%04x (partitsioonitabelis %d) parandatakse\n"
"kirjutamisel (w) ära\n"
-#: fdisk/fdisk.c:976
+#: fdisk/fdisk.c:988
msgid ""
"\n"
"got EOF thrice - exiting..\n"
@@ -2201,65 +2437,65 @@ msgstr ""
"\n"
"Sain EOF-i kolm korda järjest - aitab\n"
-#: fdisk/fdisk.c:1015
+#: fdisk/fdisk.c:1027
msgid "Hex code (type L to list codes): "
msgstr "Kuueteistkümnendsüsteemis kood (L näitab koodide nimekirja): "
-#: fdisk/fdisk.c:1054
+#: fdisk/fdisk.c:1066
#, c-format
msgid "%s (%d-%d, default %d): "
msgstr "%s (%d-%d, vaikimisi %d): "
-#: fdisk/fdisk.c:1110
+#: fdisk/fdisk.c:1122
#, c-format
msgid "Using default value %d\n"
msgstr "Kasutan vaikimisi väärtust %d\n"
-#: fdisk/fdisk.c:1114
+#: fdisk/fdisk.c:1126
msgid "Value out of range.\n"
msgstr "Väärtus on piiridest väljas\n"
-#: fdisk/fdisk.c:1124
+#: fdisk/fdisk.c:1136
msgid "Partition number"
msgstr "Partitsiooni number"
-#: fdisk/fdisk.c:1133
+#: fdisk/fdisk.c:1145
#, c-format
msgid "Warning: partition %d has empty type\n"
msgstr "Hoiatus: partitsioonil %d on tühi tüüp\n"
-#: fdisk/fdisk.c:1140
+#: fdisk/fdisk.c:1152
msgid "cylinder"
msgstr "silinder"
-#: fdisk/fdisk.c:1140
+#: fdisk/fdisk.c:1152
msgid "sector"
msgstr "sektor"
-#: fdisk/fdisk.c:1149
+#: fdisk/fdisk.c:1161
#, c-format
msgid "Changing display/entry units to %s\n"
msgstr "Sisestamisel ja näitamisel on nüüd ühikuteks %s\n"
-#: fdisk/fdisk.c:1160
+#: fdisk/fdisk.c:1172
#, c-format
msgid "WARNING: Partition %d is an extended partition\n"
msgstr "Hoiatus: partitsioon %d on extended-partitsioon\n"
-#: fdisk/fdisk.c:1171
+#: fdisk/fdisk.c:1183
msgid "DOS Compatibility flag is set\n"
msgstr "DOSiga ühilduvuse lipp on püsti\n"
-#: fdisk/fdisk.c:1175
+#: fdisk/fdisk.c:1187
msgid "DOS Compatibility flag is not set\n"
msgstr "DOSiga ühilduvuse lipp pole püsti\n"
-#: fdisk/fdisk.c:1261
+#: fdisk/fdisk.c:1273
#, c-format
msgid "Partition %d does not exist yet!\n"
msgstr "Partitsiooni %d pole veel olemas!\n"
-#: fdisk/fdisk.c:1266
+#: fdisk/fdisk.c:1278
msgid ""
"Type 0 means free space to many systems\n"
"(but not to Linux). Having partitions of\n"
@@ -2271,7 +2507,7 @@ msgstr ""
"tekitada tüüpi 0 partitsioone. Te saate partitsiooni\n"
"kustutada käsuga 'd'.\n"
-#: fdisk/fdisk.c:1275
+#: fdisk/fdisk.c:1287
msgid ""
"You cannot change a partition into an extended one or vice versa\n"
"Delete it first.\n"
@@ -2279,7 +2515,7 @@ msgstr ""
"Partitsiooni ei saa muuta extended'iks ega extendedist harilikuks.\n"
"Selle asemel tuleb partitsioon kustutada ja uus luua.\n"
-#: fdisk/fdisk.c:1284
+#: fdisk/fdisk.c:1296
msgid ""
"Consider leaving partition 3 as Whole disk (5),\n"
"as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2288,7 +2524,7 @@ msgstr ""
"Soovitav on jätta partitsioon 3 terveks kettaks (5),\n"
"sest SunOs/Solaris eeldab seda ja see meeldib isegi Linuxile.\n"
-#: fdisk/fdisk.c:1290
+#: fdisk/fdisk.c:1302
msgid ""
"Consider leaving partition 9 as volume header (0),\n"
"and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2297,54 +2533,54 @@ msgstr ""
"Kaaluge partitsiooni 9 jätmist köite päiseks (0) ja\n"
"partitsiooni 11 jätmist terveks kettaks (6) nagu IRIX seda eeldab\n"
-#: fdisk/fdisk.c:1303
+#: fdisk/fdisk.c:1315
#, c-format
msgid "Changed system type of partition %d to %x (%s)\n"
msgstr "Partitsiooni %d tüüp on nüüd %x (%s)\n"
-#: fdisk/fdisk.c:1357
+#: fdisk/fdisk.c:1369
#, c-format
msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
msgstr ""
"Partitsiooni %d füüsiline ja loogiline algus ei lange kokku:\n"
"(Pole Linuxi oma?)\n"
-#: fdisk/fdisk.c:1359 fdisk/fdisk.c:1367 fdisk/fdisk.c:1376 fdisk/fdisk.c:1385
+#: fdisk/fdisk.c:1371 fdisk/fdisk.c:1379 fdisk/fdisk.c:1388 fdisk/fdisk.c:1397
#, c-format
msgid " phys=(%d, %d, %d) "
msgstr " füüs=(%d, %d, %d) "
-#: fdisk/fdisk.c:1360 fdisk/fdisk.c:1368
+#: fdisk/fdisk.c:1372 fdisk/fdisk.c:1380
#, c-format
msgid "logical=(%d, %d, %d)\n"
msgstr "loogiline=(%d, %d, %d)\n"
-#: fdisk/fdisk.c:1365
+#: fdisk/fdisk.c:1377
#, c-format
msgid "Partition %d has different physical/logical endings:\n"
msgstr "Partitsiooni %d füüsiline ja loogiline lõpp ei lange kokku:\n"
-#: fdisk/fdisk.c:1374
+#: fdisk/fdisk.c:1386
#, c-format
msgid "Partition %i does not start on cylinder boundary:\n"
msgstr "Partitsioon %i ei alga silindri piirilt:\n"
-#: fdisk/fdisk.c:1377
+#: fdisk/fdisk.c:1389
#, c-format
msgid "should be (%d, %d, 1)\n"
msgstr "peaks olema (%d, %d, 1)\n"
-#: fdisk/fdisk.c:1383
+#: fdisk/fdisk.c:1395
#, c-format
msgid "Partition %i does not end on cylinder boundary:\n"
msgstr "Partitsioon %i ei lõppe silindri piiril:\n"
-#: fdisk/fdisk.c:1386
+#: fdisk/fdisk.c:1398
#, c-format
msgid "should be (%d, %d, %d)\n"
msgstr "peaks olema (%d, %d, %d)\n"
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1405
#, c-format
msgid ""
"\n"
@@ -2357,7 +2593,7 @@ msgstr ""
"Ühikud = %s suurusega %d * %d baiti\n"
"\n"
-#: fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1513
msgid ""
"Nothing to do. Ordering is correct already.\n"
"\n"
@@ -2365,16 +2601,16 @@ msgstr ""
"Midagi pole vaja teha, järjestus on juba õige\n"
"\n"
-#: fdisk/fdisk.c:1565
+#: fdisk/fdisk.c:1577
#, c-format
msgid "%*s Boot Start End Blocks Id System\n"
msgstr "%*s Boot Algus Lõpp Plokke Id Süsteem\n"
-#: fdisk/fdisk.c:1566 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:675
+#: fdisk/fdisk.c:1578 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:675
msgid "Device"
msgstr "Seade"
-#: fdisk/fdisk.c:1603
+#: fdisk/fdisk.c:1615
msgid ""
"\n"
"Partition table entries are not in disk order\n"
@@ -2382,7 +2618,7 @@ msgstr ""
"\n"
"Partitsioonitabeli kirjed on füüsilisest erinevas järjekorras\n"
-#: fdisk/fdisk.c:1613
+#: fdisk/fdisk.c:1625
#, c-format
msgid ""
"\n"
@@ -2393,91 +2629,91 @@ msgstr ""
"Ketas %s: %d pead, %d sektorit rajal, %d silindrit\n"
"\n"
-#: fdisk/fdisk.c:1615
+#: fdisk/fdisk.c:1627
msgid "Nr AF Hd Sec Cyl Hd Sec Cyl Start Size ID\n"
msgstr "Nr AF Pä Sek Sil Pä Sek Sil Algus Maht ID\n"
-#: fdisk/fdisk.c:1659
+#: fdisk/fdisk.c:1671
#, c-format
msgid "Warning: partition %d contains sector 0\n"
msgstr "Hoiatus: partitsioon %d sisaldab sektorit 0\n"
-#: fdisk/fdisk.c:1662
+#: fdisk/fdisk.c:1674
#, c-format
msgid "Partition %d: head %d greater than maximum %d\n"
msgstr "Partitsioon %d: pea %d on suurem kui peade arv %d\n"
-#: fdisk/fdisk.c:1665
+#: fdisk/fdisk.c:1677
#, c-format
msgid "Partition %d: sector %d greater than maximum %d\n"
msgstr "Partitsioon %d: sektor %d on suurem kui sektroite arv rajal %d\n"
-#: fdisk/fdisk.c:1668
+#: fdisk/fdisk.c:1680
#, c-format
msgid "Partitions %d: cylinder %d greater than maximum %d\n"
msgstr "Partitsioon %d: silinder %d on suurem kui silindrite arv %d\n"
-#: fdisk/fdisk.c:1672
+#: fdisk/fdisk.c:1684
#, c-format
msgid "Partition %d: previous sectors %d disagrees with total %d\n"
msgstr "Partitsioon %d: eelnevate sektorite arv %d ei klapi summarsega (%d)\n"
-#: fdisk/fdisk.c:1704
+#: fdisk/fdisk.c:1716
#, c-format
msgid "Warning: bad start-of-data in partition %d\n"
msgstr "Hoiatus: partitsioonis %d on andmete algus vigane\n"
-#: fdisk/fdisk.c:1712
+#: fdisk/fdisk.c:1724
#, c-format
msgid "Warning: partition %d overlaps partition %d.\n"
msgstr "Hoiatus: partitsioon %d kattub partitsiooniga %d\n"
-#: fdisk/fdisk.c:1732
+#: fdisk/fdisk.c:1744
#, c-format
msgid "Warning: partition %d is empty\n"
msgstr "Hoiatus: partitsioon %d on tühi\n"
-#: fdisk/fdisk.c:1737
+#: fdisk/fdisk.c:1749
#, c-format
msgid "Logical partition %d not entirely in partition %d\n"
msgstr "Loogiline partitsioon %d pole üleni partitsioonis %d\n"
-#: fdisk/fdisk.c:1743
+#: fdisk/fdisk.c:1755
#, c-format
msgid "Total allocated sectors %d greater than the maximum %d\n"
msgstr "Kogu kasutataud sektorite arv %d on suurem kui sektorite koguarv %d\n"
-#: fdisk/fdisk.c:1746
+#: fdisk/fdisk.c:1758
#, c-format
msgid "%d unallocated sectors\n"
msgstr "%d vaba sektorit\n"
-#: fdisk/fdisk.c:1759 fdisk/fdisksgilabel.c:661 fdisk/fdisksunlabel.c:505
+#: fdisk/fdisk.c:1771 fdisk/fdisksgilabel.c:661 fdisk/fdisksunlabel.c:505
#, c-format
msgid "Partition %d is already defined. Delete it before re-adding it.\n"
msgstr "Partitsioon %d on juba olemas. Kustutage see enne uuesti lisamist\n"
-#: fdisk/fdisk.c:1780 fdisk/fdiskbsdlabel.c:279 fdisk/fdisksgilabel.c:683
+#: fdisk/fdisk.c:1792 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:683
#: fdisk/fdisksunlabel.c:520
#, c-format
msgid "First %s"
msgstr "Esimene %s"
-#: fdisk/fdisk.c:1795 fdisk/fdisksunlabel.c:561
+#: fdisk/fdisk.c:1807 fdisk/fdisksunlabel.c:561
#, c-format
msgid "Sector %d is already allocated\n"
msgstr "Sektor%d on juba kasutusel\n"
-#: fdisk/fdisk.c:1831
+#: fdisk/fdisk.c:1843
msgid "No free sectors available\n"
msgstr "Vabad sektorid on otsas\n"
-#: fdisk/fdisk.c:1840 fdisk/fdiskbsdlabel.c:286 fdisk/fdisksunlabel.c:572
+#: fdisk/fdisk.c:1852 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:572
#, c-format
msgid "Last %s or +size or +sizeM or +sizeK"
msgstr "Viimane %s või +suurus või +suurusM või +suurusK"
-#: fdisk/fdisk.c:1905
+#: fdisk/fdisk.c:1917
msgid ""
"\tSorry - this fdisk cannot handle AIX disk labels.\n"
"\tIf you want to add DOS-type partitions, create\n"
@@ -2490,17 +2726,17 @@ msgstr ""
"\t(käsuga o).\n"
"\tHOIATUS: see hävitab ketta praeguse sisu!\n"
-#: fdisk/fdisk.c:1914 fdisk/fdiskbsdlabel.c:613
+#: fdisk/fdisk.c:1926 fdisk/fdiskbsdlabel.c:617
msgid "The maximum number of partitions has been created\n"
msgstr "Maksimaalne arv partitsioone on juba loodud\n"
-#: fdisk/fdisk.c:1924
+#: fdisk/fdisk.c:1936
msgid "You must delete some partition and add an extended partition first\n"
msgstr ""
"Te peate kõigepealt mõne partitsiooni kustutama ja asemele\n"
"extended partitsiooni tegema\n"
-#: fdisk/fdisk.c:1929
+#: fdisk/fdisk.c:1941
#, c-format
msgid ""
"Command action\n"
@@ -2511,20 +2747,20 @@ msgstr ""
" %s\n"
" p primaarse partitsiooni (1-4) loomine\n"
-#: fdisk/fdisk.c:1931
+#: fdisk/fdisk.c:1943
msgid "l logical (5 or over)"
msgstr "l loogilise partitsiooni (5-...) loomine"
-#: fdisk/fdisk.c:1931
+#: fdisk/fdisk.c:1943
msgid "e extended"
msgstr "e extended partitsiooni loomine"
-#: fdisk/fdisk.c:1948
+#: fdisk/fdisk.c:1960
#, c-format
msgid "Invalid partition number for type `%c'\n"
msgstr "Vigane partitsiooni number tüübile `%c'\n"
-#: fdisk/fdisk.c:1984
+#: fdisk/fdisk.c:1996
msgid ""
"The partition table has been altered!\n"
"\n"
@@ -2532,11 +2768,11 @@ msgstr ""
"Partitsioonitabelit on muudetud!\n"
"\n"
-#: fdisk/fdisk.c:1993
+#: fdisk/fdisk.c:2005
msgid "Calling ioctl() to re-read partition table.\n"
msgstr "Kasutan ioctl() partitsioonitabeli uuesti lugemiseks\n"
-#: fdisk/fdisk.c:2009
+#: fdisk/fdisk.c:2021
#, c-format
msgid ""
"\n"
@@ -2550,7 +2786,7 @@ msgstr ""
"Tuum kasutab endiselt vana tabelit,\n"
"uus tabel hakkab kehtima järgmisest buudist alates.\n"
-#: fdisk/fdisk.c:2019
+#: fdisk/fdisk.c:2031
msgid ""
"\n"
"WARNING: If you have created or modified any DOS 6.x\n"
@@ -2562,64 +2798,64 @@ msgstr ""
"partitsioone, lugege palun fdisk'i manuali\n"
"lisainformatsiooni jaoks.\n"
-#: fdisk/fdisk.c:2026
+#: fdisk/fdisk.c:2038
msgid "Syncing disks.\n"
msgstr "Kirjutan puhvreid kettale\n"
-#: fdisk/fdisk.c:2073
+#: fdisk/fdisk.c:2085
#, c-format
msgid "Partition %d has no data area\n"
msgstr "Partitsioonil %d pole andmetele ruumi eraldatud\n"
-#: fdisk/fdisk.c:2078
+#: fdisk/fdisk.c:2090
msgid "New beginning of data"
msgstr "Andmete uus algus"
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2106
msgid "Expert command (m for help): "
msgstr "Eksperdi käsk (m annab abiinfot): "
-#: fdisk/fdisk.c:2107
+#: fdisk/fdisk.c:2119
msgid "Number of cylinders"
msgstr "Sisestage silindrite arv"
-#: fdisk/fdisk.c:2134
+#: fdisk/fdisk.c:2146
msgid "Number of heads"
msgstr "Sisetage peade arv"
-#: fdisk/fdisk.c:2159
+#: fdisk/fdisk.c:2171
msgid "Number of sectors"
msgstr "Sisetage sektorite arv"
-#: fdisk/fdisk.c:2162
+#: fdisk/fdisk.c:2174
msgid "Warning: setting sector offset for DOS compatiblity\n"
msgstr "Hoiatus: sean sektorite offseti DOSiga ühilduvuse jaoks\n"
-#: fdisk/fdisk.c:2237
+#: fdisk/fdisk.c:2249
#, c-format
msgid "Disk %s doesn't contain a valid partition table\n"
msgstr "Seade %s ei sisalda äratuntavat partitsioonitabelit\n"
-#: fdisk/fdisk.c:2251
+#: fdisk/fdisk.c:2263
#, c-format
msgid "Cannot open %s\n"
msgstr "Ei suuda avada seadmefaili %s\n"
-#: fdisk/fdisk.c:2267 fdisk/sfdisk.c:2363
+#: fdisk/fdisk.c:2279 fdisk/sfdisk.c:2363
#, c-format
msgid "cannot open %s\n"
msgstr "Ei suuda avada faili %s\n"
-#: fdisk/fdisk.c:2289
+#: fdisk/fdisk.c:2301
#, c-format
msgid "%c: unknown command\n"
msgstr "%c: tundmatu käsk\n"
-#: fdisk/fdisk.c:2339
+#: fdisk/fdisk.c:2351
msgid "This kernel finds the sector size itself - -b option ignored\n"
msgstr "Kasutatav tuum leiab sektori suuruse ise - ignoreerin -b võtit\n"
-#: fdisk/fdisk.c:2342
+#: fdisk/fdisk.c:2355
msgid ""
"Warning: the -b (set sector size) option should be used with one specified "
"device\n"
@@ -2627,20 +2863,19 @@ msgstr ""
"Hoiatus: -b võtit (sektori suuruse seadmine) tuleks kasutada ainult ühe "
"täpselt määratud seadmega\n"
-#: fdisk/fdisk.c:2405
-#, c-format
-msgid ""
-"Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
-"To return to DOS partition table mode, use the 'r' command.\n"
+#. OSF label, and no DOS label
+#: fdisk/fdisk.c:2414
+#, fuzzy, c-format
+msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
msgstr ""
"Leidisn seadmelt %s OSF/1 partitsioonitabeli, lähen OSF/1 rezhiimi.\n"
"DOSi partitsioonitabeli rezhiimi naasmiseks kasutage käsku `r'.\n"
-#: fdisk/fdisk.c:2413
+#: fdisk/fdisk.c:2424
msgid "Command (m for help): "
msgstr "Käsk (m annab abiinfot): "
-#: fdisk/fdisk.c:2429
+#: fdisk/fdisk.c:2440
#, c-format
msgid ""
"\n"
@@ -2649,15 +2884,15 @@ msgstr ""
"\n"
"Aktiivne buutfail on %s\n"
-#: fdisk/fdisk.c:2431
+#: fdisk/fdisk.c:2442
msgid "Please enter the name of the new boot file: "
msgstr "Palun sisestage uue buutfaili nimi: "
-#: fdisk/fdisk.c:2433
+#: fdisk/fdisk.c:2444
msgid "Boot file unchanged\n"
msgstr "Buutfail jäi samaks\n"
-#: fdisk/fdisk.c:2497
+#: fdisk/fdisk.c:2508
msgid ""
"\n"
"\tSorry, no experts menu for SGI partition tables available.\n"
@@ -2695,7 +2930,7 @@ msgstr ""
"\t ketas loogiliselt oma AIX masinast\n"
"\t (muidu saab Teist AIXpert)."
-#: fdisk/fdiskbsdlabel.c:117
+#: fdisk/fdiskbsdlabel.c:122
#, c-format
msgid ""
"\n"
@@ -2704,169 +2939,169 @@ msgstr ""
"\n"
"BSD partitsioonitabel seadmel %s\n"
-#: fdisk/fdiskbsdlabel.c:125
+#: fdisk/fdiskbsdlabel.c:130
msgid " d delete a BSD partition"
msgstr " d kustutada BSD partitsioon"
-#: fdisk/fdiskbsdlabel.c:126
+#: fdisk/fdiskbsdlabel.c:131
msgid " e edit drive data"
msgstr " e redigeerida sedame andmeid"
-#: fdisk/fdiskbsdlabel.c:127
+#: fdisk/fdiskbsdlabel.c:132
msgid " i install bootstrap"
msgstr " i installeerida bootstrap"
-#: fdisk/fdiskbsdlabel.c:128
+#: fdisk/fdiskbsdlabel.c:133
msgid " l list known filesystem types"
msgstr " l anda nimekiri tuntud failisüsteemide tüüpidest"
-#: fdisk/fdiskbsdlabel.c:130
+#: fdisk/fdiskbsdlabel.c:135
msgid " n add a new BSD partition"
msgstr " n lisada uus BSD partitsioon"
-#: fdisk/fdiskbsdlabel.c:131
+#: fdisk/fdiskbsdlabel.c:136
msgid " p print BSD partition table"
msgstr " p näidata BSD partitsioonitabelit"
-#: fdisk/fdiskbsdlabel.c:134
+#: fdisk/fdiskbsdlabel.c:139
msgid " s show complete disklabel"
msgstr " s näidata täielikku partitsioonitabelit"
-#: fdisk/fdiskbsdlabel.c:135
+#: fdisk/fdiskbsdlabel.c:140
msgid " t change a partition's filesystem id"
msgstr " t muuta partitsiooni failisüsteemi tüüpi"
-#: fdisk/fdiskbsdlabel.c:136
+#: fdisk/fdiskbsdlabel.c:141
msgid " u change units (cylinders/sectors)"
msgstr " u muuta ühikuid (silindrid/sektorid)"
-#: fdisk/fdiskbsdlabel.c:137
+#: fdisk/fdiskbsdlabel.c:142
msgid " w write disklabel to disk"
msgstr " w kirjutada tabel kettale"
-#: fdisk/fdiskbsdlabel.c:139
+#: fdisk/fdiskbsdlabel.c:144
msgid " x link BSD partition to non-BSD partition"
msgstr " x siduda BSD partitsioon mitte-BSD partitsiooniga"
-#: fdisk/fdiskbsdlabel.c:171
+#: fdisk/fdiskbsdlabel.c:176
#, c-format
msgid "Partition %s has invalid starting sector 0.\n"
msgstr "Partitsioon %s sisaldab vigast algsektorit 0\n"
-#: fdisk/fdiskbsdlabel.c:175
+#: fdisk/fdiskbsdlabel.c:180
#, c-format
msgid "Reading disklabel of %s at sector %d.\n"
msgstr "Loen partitsioonitabelit seadmelt %s sektorist %d\n"
-#: fdisk/fdiskbsdlabel.c:185
+#: fdisk/fdiskbsdlabel.c:190
#, c-format
msgid "There is no *BSD partition on %s.\n"
msgstr "Seadmel %s ei ole BSD partitsiooni\n"
-#: fdisk/fdiskbsdlabel.c:199
+#: fdisk/fdiskbsdlabel.c:204
msgid "BSD disklabel command (m for help): "
msgstr "BSD partitsioonitabeli käsk (m annab abiinfot): "
-#: fdisk/fdiskbsdlabel.c:313
+#: fdisk/fdiskbsdlabel.c:318
#, c-format
msgid "type: %s\n"
msgstr "tüüp: %s\n"
-#: fdisk/fdiskbsdlabel.c:315
+#: fdisk/fdiskbsdlabel.c:320
#, c-format
msgid "type: %d\n"
msgstr "tüüp: %d\n"
-#: fdisk/fdiskbsdlabel.c:316
+#: fdisk/fdiskbsdlabel.c:321
#, c-format
msgid "disk: %.*s\n"
msgstr "ketas: %.*s\n"
-#: fdisk/fdiskbsdlabel.c:317
+#: fdisk/fdiskbsdlabel.c:322
#, c-format
msgid "label: %.*s\n"
msgstr "märgend: %.*s\n"
-#: fdisk/fdiskbsdlabel.c:318
+#: fdisk/fdiskbsdlabel.c:323
msgid "flags:"
msgstr "lipud:"
-#: fdisk/fdiskbsdlabel.c:320
+#: fdisk/fdiskbsdlabel.c:325
msgid " removable"
msgstr " eemaldatav"
-#: fdisk/fdiskbsdlabel.c:322
+#: fdisk/fdiskbsdlabel.c:327
msgid " ecc"
msgstr " ecc"
-#: fdisk/fdiskbsdlabel.c:324
+#: fdisk/fdiskbsdlabel.c:329
msgid " badsect"
msgstr " badsect"
#. On various machines the fields of *lp are short/int/long
#. In order to avoid problems, we cast them all to long.
-#: fdisk/fdiskbsdlabel.c:328
+#: fdisk/fdiskbsdlabel.c:333
#, c-format
msgid "bytes/sector: %ld\n"
msgstr "baite sektoris: %ld\n"
-#: fdisk/fdiskbsdlabel.c:329
+#: fdisk/fdiskbsdlabel.c:334
#, c-format
msgid "sectors/track: %ld\n"
msgstr "sektoreid rajal: %ld\n"
-#: fdisk/fdiskbsdlabel.c:330
+#: fdisk/fdiskbsdlabel.c:335
#, c-format
msgid "tracks/cylinder: %ld\n"
msgstr "radu silindris: %ld\n"
-#: fdisk/fdiskbsdlabel.c:331
+#: fdisk/fdiskbsdlabel.c:336
#, c-format
msgid "sectors/cylinder: %ld\n"
msgstr "sektoreid silindris: %ld\n"
-#: fdisk/fdiskbsdlabel.c:332
+#: fdisk/fdiskbsdlabel.c:337
#, c-format
msgid "cylinders: %ld\n"
msgstr "silindreid: %ld\n"
-#: fdisk/fdiskbsdlabel.c:333
+#: fdisk/fdiskbsdlabel.c:338
#, c-format
msgid "rpm: %d\n"
msgstr "rpm: %d\n"
-#: fdisk/fdiskbsdlabel.c:334
+#: fdisk/fdiskbsdlabel.c:339
#, c-format
msgid "interleave: %d\n"
msgstr "interleave: %d\n"
-#: fdisk/fdiskbsdlabel.c:335
+#: fdisk/fdiskbsdlabel.c:340
#, c-format
msgid "trackskew: %d\n"
msgstr "trackskew: %d\n"
-#: fdisk/fdiskbsdlabel.c:336
+#: fdisk/fdiskbsdlabel.c:341
#, c-format
msgid "cylinderskew: %d\n"
msgstr "cylinderskew: %d\n"
-#: fdisk/fdiskbsdlabel.c:337
+#: fdisk/fdiskbsdlabel.c:342
#, c-format
msgid "headswitch: %ld\t\t# milliseconds\n"
msgstr "peade vahetus: %ld\t\t# millisekundit\n"
-#: fdisk/fdiskbsdlabel.c:339
+#: fdisk/fdiskbsdlabel.c:344
#, c-format
msgid "track-to-track seek: %ld\t# milliseconds\n"
msgstr ""
"rajalt rajale seek: %ld\n"
"# millisekundit\n"
-#: fdisk/fdiskbsdlabel.c:341
+#: fdisk/fdiskbsdlabel.c:346
msgid "drivedata: "
msgstr "seadme andmed: "
-#: fdisk/fdiskbsdlabel.c:350
+#: fdisk/fdiskbsdlabel.c:355
#, c-format
msgid ""
"\n"
@@ -2875,97 +3110,97 @@ msgstr ""
"\n"
"%d partitsiooni:\n"
-#: fdisk/fdiskbsdlabel.c:351
+#: fdisk/fdiskbsdlabel.c:356
msgid "# start end size fstype [fsize bsize cpg]\n"
msgstr "# algus lõpp maht fstüüp [fmaht bmaht cpg]\n"
-#: fdisk/fdiskbsdlabel.c:400 fdisk/fdiskbsdlabel.c:403
+#: fdisk/fdiskbsdlabel.c:405 fdisk/fdiskbsdlabel.c:408
#, c-format
msgid "Writing disklabel to %s.\n"
msgstr "Kirjutan partitsioonitabelit seadmele %s\n"
-#: fdisk/fdiskbsdlabel.c:415 fdisk/fdiskbsdlabel.c:417
+#: fdisk/fdiskbsdlabel.c:420 fdisk/fdiskbsdlabel.c:422
#, c-format
msgid "%s contains no disklabel.\n"
msgstr "%s ei sisalda partitsioonitabelit\n"
-#: fdisk/fdiskbsdlabel.c:422
+#: fdisk/fdiskbsdlabel.c:427
msgid "Do you want to create a disklabel? (y/n) "
msgstr "Kas soovite luua partitsioonitabelit? (y/n) "
-#: fdisk/fdiskbsdlabel.c:461
+#: fdisk/fdiskbsdlabel.c:466
msgid "bytes/sector"
msgstr "baiti sektoris"
-#: fdisk/fdiskbsdlabel.c:462
+#: fdisk/fdiskbsdlabel.c:467
msgid "sectors/track"
msgstr "sektorit rajal"
-#: fdisk/fdiskbsdlabel.c:463
+#: fdisk/fdiskbsdlabel.c:468
msgid "tracks/cylinder"
msgstr "rada silindris"
-#: fdisk/fdiskbsdlabel.c:471
+#: fdisk/fdiskbsdlabel.c:476
msgid "sectors/cylinder"
msgstr "sektorit silindris"
-#: fdisk/fdiskbsdlabel.c:475
+#: fdisk/fdiskbsdlabel.c:480
msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
msgstr "Peab olema <= sektoritest rajal * radadest silindril (vaikimisi)\n"
-#: fdisk/fdiskbsdlabel.c:477
+#: fdisk/fdiskbsdlabel.c:482
msgid "rpm"
msgstr "rpm"
-#: fdisk/fdiskbsdlabel.c:478
+#: fdisk/fdiskbsdlabel.c:483
msgid "interleave"
msgstr "interleave"
-#: fdisk/fdiskbsdlabel.c:479
+#: fdisk/fdiskbsdlabel.c:484
msgid "trackskew"
msgstr "trackskew"
-#: fdisk/fdiskbsdlabel.c:480
+#: fdisk/fdiskbsdlabel.c:485
msgid "cylinderskew"
msgstr "cylinderskew"
-#: fdisk/fdiskbsdlabel.c:481
+#: fdisk/fdiskbsdlabel.c:486
msgid "headswitch"
msgstr "headswitch"
-#: fdisk/fdiskbsdlabel.c:482
+#: fdisk/fdiskbsdlabel.c:487
msgid "track-to-track seek"
msgstr "rajalt rajale seek"
-#: fdisk/fdiskbsdlabel.c:523
+#: fdisk/fdiskbsdlabel.c:528
#, c-format
msgid "Bootstrap: %sboot -> boot%s (%s): "
msgstr "Bootstrap: %sboot -> boot%s (%s): "
-#: fdisk/fdiskbsdlabel.c:548
+#: fdisk/fdiskbsdlabel.c:553
msgid "Bootstrap overlaps with disk label!\n"
msgstr "Bootstrap kattub partitsioonitabeliga!\n"
-#: fdisk/fdiskbsdlabel.c:569 fdisk/fdiskbsdlabel.c:571
+#: fdisk/fdiskbsdlabel.c:574 fdisk/fdiskbsdlabel.c:576
#, c-format
msgid "Bootstrap installed on %s.\n"
msgstr "Bootstrap sai installitud seadmele %s\n"
-#: fdisk/fdiskbsdlabel.c:593
+#: fdisk/fdiskbsdlabel.c:598
#, c-format
msgid "Partition (a-%c): "
msgstr "Partitsioon (a-%c): "
-#: fdisk/fdiskbsdlabel.c:624
+#: fdisk/fdiskbsdlabel.c:629
msgid "This partition already exists.\n"
msgstr "See partitsioon on juba olemas\n"
-#: fdisk/fdiskbsdlabel.c:744
+#: fdisk/fdiskbsdlabel.c:755
#, c-format
msgid "Warning: too many partitions (%d, maximum is %d).\n"
msgstr "Hoiatus: liiga palju partitsioone (%d, maksimum on %d)\n"
-#: fdisk/fdiskbsdlabel.c:791
+#: fdisk/fdiskbsdlabel.c:803
msgid ""
"\n"
"Syncing disks.\n"
@@ -3372,7 +3607,7 @@ msgstr ""
#: fdisk/fdisksunlabel.c:230
#, c-format
msgid "Autoconfigure found a %s%s%s\n"
-msgstr ""
+msgstr "Automaatne konfigureerimine leidis %s%s%s\n"
#: fdisk/fdisksunlabel.c:257
msgid ""
@@ -3391,26 +3626,29 @@ msgid ""
" ? auto configure\n"
" 0 custom (with hardware detected defaults)"
msgstr ""
+"Kettaseadme tüüp\n"
+" ? automaatne konfigureerimine\n"
+" 0 kohandatud (vaikeväärtustega riistavarlt)"
#: fdisk/fdisksunlabel.c:278
msgid "Select type (? for auto, 0 for custom): "
-msgstr ""
+msgstr "Valige tüüp (? tähendab automaatset, 0 kohandatut): "
#: fdisk/fdisksunlabel.c:290
msgid "Autoconfigure failed.\n"
-msgstr ""
+msgstr "Automaatne konfigureerimine ei õnnestunud\n"
#: fdisk/fdisksunlabel.c:318
msgid "Sectors/track"
-msgstr ""
+msgstr "Sektoreid rajal"
#: fdisk/fdisksunlabel.c:325
msgid "Alternate cylinders"
-msgstr ""
+msgstr "Alternatiivseid silindreid"
#: fdisk/fdisksunlabel.c:328
msgid "Physical cylinders"
-msgstr ""
+msgstr "Füüsilisi silindreid"
#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:725
msgid "Rotation speed (rpm)"
@@ -3418,23 +3656,23 @@ msgstr "Pöörlemiskiirus (rpm)"
#: fdisk/fdisksunlabel.c:333 fdisk/fdisksunlabel.c:718
msgid "Interleave factor"
-msgstr ""
+msgstr "Vahelejätu tegur"
#: fdisk/fdisksunlabel.c:336 fdisk/fdisksunlabel.c:711
msgid "Extra sectors per cylinder"
-msgstr ""
+msgstr "Lisasektoreid silindril"
#: fdisk/fdisksunlabel.c:350
msgid "You may change all the disk params from the x menu"
-msgstr ""
+msgstr "Kõiki kettaseadme parameetreid saab muuta x menüüst"
#: fdisk/fdisksunlabel.c:357
msgid "3,5\" floppy"
-msgstr ""
+msgstr "3,5\" floppi"
#: fdisk/fdisksunlabel.c:357
msgid "Linux custom"
-msgstr ""
+msgstr "Linuxi oma"
#: fdisk/fdisksunlabel.c:444
#, c-format
@@ -3449,18 +3687,20 @@ msgstr "Partitsioon %d kattub teistega sektorites %d-%d\n"
#: fdisk/fdisksunlabel.c:486
#, c-format
msgid "Unused gap - sectors 0-%d\n"
-msgstr ""
+msgstr "Kasutamata vahemik - sektorid 0-%d\n"
#: fdisk/fdisksunlabel.c:488 fdisk/fdisksunlabel.c:492
#, c-format
msgid "Unused gap - sectors %d-%d\n"
-msgstr ""
+msgstr "Kasutamata vahemik - sektorid %d-%d\n"
#: fdisk/fdisksunlabel.c:515
msgid ""
"Other partitions already cover the whole disk.\n"
"Delete some/shrink them before retry.\n"
msgstr ""
+"Teised partitsioonid katavad juba kogu ketta.\n"
+"Kustutage või vähendage neist mõnda ja proovige uuesti\n"
#: fdisk/fdisksunlabel.c:591
#, c-format
@@ -3469,6 +3709,8 @@ msgid ""
"%d %s covers some other partition. Your entry has been changed\n"
"to %d %s\n"
msgstr ""
+"Kolmas partitsioon ei kata kogu ketast, aga sisesatud väärtus %d %s\n"
+"katab mingi muu partitsiooni. Sisestatud kirje uueks väärtuseks on %d %s\n"
#: fdisk/fdisksunlabel.c:611
#, c-format
@@ -3476,6 +3718,8 @@ 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 ""
+"Kui soovite hoida ühilduvust SunOS'i/Solarisega, jätke see partitsioon\n"
+"kogu ketast katma (5), alguseks 0, pikkuseks %u sektorit\n"
#: fdisk/fdisksunlabel.c:624
msgid ""
@@ -3485,6 +3729,11 @@ msgid ""
"Type YES if you're very sure you would like that partition\n"
"tagged with 82 (Linux swap): "
msgstr ""
+"On ülimalt soovitav, et partitsioon, mis algab 0. sektorist\n"
+"oleks UFS, EXT2FS või SunOSi saalimisala. Linuxi saalimisala\n"
+"sinna kirjutamine võib hävitada partitsioonitabeli ja alglaadeploki.\n"
+"sisestage YES, kui olete tõdesti kindlad, et tahate partitsiooni tüübiks\n"
+"panna 82 (Linuxi saalimisala):"
#: fdisk/fdisksunlabel.c:655
#, c-format
@@ -3497,6 +3746,13 @@ msgid ""
"Units = %s of %d * 512 bytes\n"
"\n"
msgstr ""
+"\n"
+"Ketas %s (Suni partitsioonitabel): %d pead, %d sektorit, %d rpm\n"
+"%d silindrit, %d alternatiivset silindrit, %d füüsilist silindrit\n"
+"%d lisasektorit silindril, vahelejätt %d:1\n"
+"%s\n"
+"Ühikud = %s suurusega %d * 512 baiti\n"
+"\n"
#: fdisk/fdisksunlabel.c:669
#, c-format
@@ -3506,19 +3762,23 @@ msgid ""
"Units = %s of %d * 512 bytes\n"
"\n"
msgstr ""
+"\n"
+"Ketas %s (Suni partitsioonitabel): %d pead, %d sektorit, %d silindrit\n"
+"Ühikud = %s suurusega %d * 512 baiti\n"
+"\n"
#: fdisk/fdisksunlabel.c:674
#, c-format
msgid "%*s Flag Start End Blocks Id System\n"
-msgstr ""
+msgstr "%*s Lipp Algus Lõpp Plokke ID Süsteem\n"
#: fdisk/fdisksunlabel.c:699
msgid "Number of alternate cylinders"
-msgstr ""
+msgstr "Alternatiivsete silindrite arv"
#: fdisk/fdisksunlabel.c:732
msgid "Number of physical cylinders"
-msgstr ""
+msgstr "Füüsiliste silindrite arv"
#: fdisk/i386_sys_types.c:7
msgid "FAT12"
@@ -3801,9 +4061,8 @@ msgid "Solaris boot"
msgstr "Solaris boot"
#: fdisk/i386_sys_types.c:77
-#, fuzzy
msgid "DRDOS/sec (FAT-12)"
-msgstr "DRDOS sekund. (FAT-16)"
+msgstr "DRDOS sekund. (FAT-12)"
#: fdisk/i386_sys_types.c:78
msgid "DRDOS/sec (FAT-16 < 32M)"
@@ -3887,50 +4146,50 @@ msgstr "BBT"
#: fdisk/sfdisk.c:151
#, c-format
msgid "seek error on %s - cannot seek to %lu\n"
-msgstr ""
+msgstr "Postisioneerimise viga seadmel %s - ei saa minna positsioonile %lu\n"
#: fdisk/sfdisk.c:156
#, c-format
msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
-msgstr ""
+msgstr "Positsioneerimise viga: tahtsin 0x%08x%08x, sain 0x%08x%08x\n"
#: fdisk/sfdisk.c:202
msgid "out of memory - giving up\n"
-msgstr ""
+msgstr "Mälu sai otsa - annan alla\n"
#: fdisk/sfdisk.c:207 fdisk/sfdisk.c:290
#, c-format
msgid "read error on %s - cannot read sector %lu\n"
-msgstr ""
+msgstr "Lugemisviga seadmel %s - ei saa lugeda sektorit %lu\n"
#: fdisk/sfdisk.c:225
#, c-format
msgid "ERROR: sector %lu does not have an msdos signature\n"
-msgstr ""
+msgstr "VIGA: sektor %lu ei sisalda msdos'i signatuuri\n"
#: fdisk/sfdisk.c:240
#, c-format
msgid "write error on %s - cannot write sector %lu\n"
-msgstr ""
+msgstr "Kirjutamisviga seadmel %s - ei saa kirjutada sektorit %lu\n"
#: fdisk/sfdisk.c:278
#, c-format
msgid "cannot open partition sector save file (%s)\n"
-msgstr ""
+msgstr "Ei suuda avada partitsioonitabeli salvestusfaili (%s)\n"
#: fdisk/sfdisk.c:296
#, c-format
msgid "write error on %s\n"
-msgstr ""
+msgstr "Kirjutamise viga seadmel %s\n"
#: fdisk/sfdisk.c:314
#, c-format
msgid "cannot stat partition restore file (%s)\n"
-msgstr ""
+msgstr "Ei saa lugeda partitsioonitabeli salvestusfaili staatust (%s)\n"
#: fdisk/sfdisk.c:319
msgid "partition restore file has wrong size - not restoring\n"
-msgstr ""
+msgstr "Partitsioonitabeli salvestusfail on vale pikkusega - ei taasta\n"
#: fdisk/sfdisk.c:323
msgid "out of memory?\n"
@@ -3939,7 +4198,7 @@ msgstr "Mälu sai otsa\n"
#: fdisk/sfdisk.c:329
#, c-format
msgid "cannot open partition restore file (%s)\n"
-msgstr ""
+msgstr "Ei saa avada partitsioonitabeli salvestusfaili (%s)\n"
#: fdisk/sfdisk.c:335
#, c-format
@@ -3954,17 +4213,17 @@ msgstr "ei suuda avada seadet %s kirjutamiseks\n"
#: fdisk/sfdisk.c:354
#, c-format
msgid "error writing sector %lu on %s\n"
-msgstr ""
+msgstr "Viga sektori %lu kirjutamisel seadmele %s\n"
#: fdisk/sfdisk.c:405
#, c-format
msgid "Disk %s: cannot get size\n"
-msgstr ""
+msgstr "Ketas %s: ei suuda mahtu kindlaks teha\n"
#: fdisk/sfdisk.c:410
#, c-format
msgid "Disk %s: cannot get geometry\n"
-msgstr ""
+msgstr "Ketas %s: ei suuda geomeetriat kindlaks teha\n"
#: fdisk/sfdisk.c:434
#, c-format
@@ -3973,21 +4232,24 @@ msgid ""
"the entire disk. Using fdisk on it is probably meaningless.\n"
"[Use the --force option if you really want this]\n"
msgstr ""
+"Hoiatus: start=%lu - see paistab olevat pigem partitsioon kui\n"
+"terve ketas. fdiski kasutamine on ilmselt mõttetu.\n"
+"Kasutage --force võtit, kui tõesti tahate seda teha.\n"
#: fdisk/sfdisk.c:441
#, c-format
msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
-msgstr ""
+msgstr "Hoiatus: HDIO_GETGEO ütles, et seadmel on %lu pead\n"
#: fdisk/sfdisk.c:444
#, c-format
msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
-msgstr ""
+msgstr "Hoiatus: HDIO_GETGEO ütles, et seadmel on %lu sektorit\n"
#: fdisk/sfdisk.c:448
#, c-format
msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
-msgstr ""
+msgstr "Hoiatus: BLKGETSIZE/HDIO_GETGEO ütles, et seadmel on %lu silindrit\n"
#: fdisk/sfdisk.c:452
#, c-format
@@ -3995,6 +4257,9 @@ msgid ""
"Warning: unlikely number of sectors (%lu) - usually at most 63\n"
"This will give problems with all software that uses C/H/S addressing.\n"
msgstr ""
+"Hoiatus: ebatõenäoline sektorite arv rajal (%lu) - harilikult kuni 63\n"
+"See tekitab probleeme kõigi programmidega, mis üritavad kasutada\n"
+"C/H/S (silinder/pea/sektor) adresseerimist.\n"
#: fdisk/sfdisk.c:456
#, c-format
@@ -4002,12 +4267,15 @@ msgid ""
"\n"
"Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n"
msgstr ""
+"\n"
+"Ketas %s: %lu silindrit, %lu pead, %lu sektorit rajal\n"
#: fdisk/sfdisk.c:538
#, c-format
msgid ""
"%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
msgstr ""
+"%s partitsioonil %s sisaldab vigast pead numbrit: %lu (peaks olema 0-%lu)\n"
#: fdisk/sfdisk.c:543
#, c-format
@@ -4015,6 +4283,8 @@ msgid ""
"%s of partition %s has impossible value for sector: %lu (should be in 1-%"
"lu)\n"
msgstr ""
+"%s partitsioonil %s sisaldab vigast sektori väärtust: %lu (peaks olema 1-%"
+"lu)\n"
#: fdisk/sfdisk.c:548
#, c-format
@@ -4022,22 +4292,28 @@ msgid ""
"%s of partition %s has impossible value for cylinders: %lu (should be in 0-%"
"lu)\n"
msgstr ""
+"%s partitsioonil %s sisaldab vigast silindri väärtust: %lu (peaks olema 0-%"
+"lu)\n"
#: fdisk/sfdisk.c:588
msgid ""
"Id Name\n"
"\n"
msgstr ""
+"ID Nimi\n"
+"\n"
#: fdisk/sfdisk.c:741
msgid "Re-reading the partition table ...\n"
-msgstr ""
+msgstr "Loen uuesti partitsioonitabelit...\n"
#: fdisk/sfdisk.c:747
msgid ""
"The command to re-read the partition table failed\n"
"Reboot your system now, before using mkfs\n"
msgstr ""
+"Partitsioonitabeli ülelugemine ei õnnestunud\n"
+"Tehke arvutile kohe alglaadimine, enne mkfs kasutamist\n"
#: fdisk/sfdisk.c:752
#, c-format
@@ -4047,21 +4323,21 @@ msgstr "Viga %s sulgemisel\n"
#: fdisk/sfdisk.c:790
#, c-format
msgid "%s: no such partition\n"
-msgstr ""
+msgstr "%s: sellist partitsiooni ei ole\n"
#: fdisk/sfdisk.c:813
msgid "unrecognized format - using sectors\n"
-msgstr ""
+msgstr "Tundmatu formaat - kasutan sektoreid\n"
#: fdisk/sfdisk.c:852
#, c-format
msgid "# partition table of %s\n"
-msgstr ""
+msgstr "# %s partitsioonitabel\n"
#: fdisk/sfdisk.c:863
#, c-format
msgid "unimplemented format - using %s\n"
-msgstr ""
+msgstr "Seda formaati pole veel realiseeritud - kasutan %s\n"
#: fdisk/sfdisk.c:867
#, c-format
@@ -4069,10 +4345,12 @@ msgid ""
"Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
"\n"
msgstr ""
+"Ühikud = silindrid %lu baidiga, plokid 1024 baidiga, loendan alates %d\n"
+"\n"
#: fdisk/sfdisk.c:870
msgid " Device Boot Start End #cyls #blocks Id System\n"
-msgstr ""
+msgstr " Seade Buut Algus Lõpp #sil #plokke ID Süsteem\n"
#: fdisk/sfdisk.c:875
#, c-format
@@ -4080,10 +4358,12 @@ msgid ""
"Units = sectors of 512 bytes, counting from %d\n"
"\n"
msgstr ""
+"Ühikud = sektorid 512 baidiga, loendan alates %d\n"
+"\n"
#: fdisk/sfdisk.c:877
msgid " Device Boot Start End #sectors Id System\n"
-msgstr ""
+msgstr " Seade Buut Algus Lõpp #sektors ID Süsteem\n"
#: fdisk/sfdisk.c:880
#, c-format
@@ -4091,10 +4371,12 @@ msgid ""
"Units = blocks of 1024 bytes, counting from %d\n"
"\n"
msgstr ""
+"Ühikud = 1024-baidised plokid, loendan alates %d\n"
+"\n"
#: fdisk/sfdisk.c:882
msgid " Device Boot Start End #blocks Id System\n"
-msgstr ""
+msgstr " Seade Buut Algus Lõpp #plokke ID Süsteem\n"
#: fdisk/sfdisk.c:885
#, c-format
@@ -4102,29 +4384,31 @@ msgid ""
"Units = megabytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
"\n"
msgstr ""
+"Ühikud = megabaidid (1048576 baiti), plokid (1024 baiti), loendan alates %d\n"
+"\n"
#: fdisk/sfdisk.c:887
msgid " Device Boot Start End MB #blocks Id System\n"
-msgstr ""
+msgstr " Seade Buut Algus Lõpp MB #plokke ID Süsteem\n"
#: fdisk/sfdisk.c:1047
#, c-format
msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
-msgstr ""
+msgstr "\t\talgus: (c,h,s) ootasin (%ld,%ld,%ld), sain (%ld,%ld,%ld)\n"
#: fdisk/sfdisk.c:1054
#, c-format
msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
-msgstr ""
+msgstr "\t\tlõpp: (c,h,s) ootasin (%ld,%ld,%ld), sain (%ld,%ld,%ld)\n"
#: fdisk/sfdisk.c:1057
#, c-format
msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
-msgstr ""
+msgstr "Partitsioon lõpeb silindril %ld, tagapool ketta lõppu\n"
#: fdisk/sfdisk.c:1067
msgid "No partitions found\n"
-msgstr ""
+msgstr "Ei leidnud ühtegi partitsiooni\n"
#: fdisk/sfdisk.c:1071
#, c-format
@@ -4133,50 +4417,53 @@ msgid ""
" for C/H/S=*/%ld/%ld (instead of %ld/%ld/%ld).\n"
"For this listing I'll assume that geometry.\n"
msgstr ""
+"Hoiatus: tundub, et see partitsioonitabel tehti geomeetria\n"
+"C/H/S=*/%ld/%ld jaoks (mitte %ld/%ld/%ld).\n"
+"Eeldan seda geomeetriat nimekirja näitamisel.\n"
#: fdisk/sfdisk.c:1120
msgid "no partition table present.\n"
-msgstr ""
+msgstr "Partitsioonitabelit ei ole\n"
#: fdisk/sfdisk.c:1122
#, c-format
msgid "strange, only %d partitions defined.\n"
-msgstr ""
+msgstr "Imelik, ainult %d partitsiooni on defineeriud\n"
#: fdisk/sfdisk.c:1131
#, c-format
msgid "Warning: partition %s has size 0 but is not marked Empty\n"
-msgstr ""
+msgstr "Hoiatus: partitsioon %s on suurusega 0, aga pole märgitud tühjaks\n"
#: fdisk/sfdisk.c:1134
#, c-format
msgid "Warning: partition %s has size 0 and is bootable\n"
-msgstr ""
+msgstr "Hoiatus: partitsioon %s on suurusega 0, kuid on märgitud buutivaks\n"
#: fdisk/sfdisk.c:1137
#, c-format
msgid "Warning: partition %s has size 0 and nonzero start\n"
-msgstr ""
+msgstr "Hoiatus: partitsioon %s on suurusega 0, kuid algus pole 0\n"
#: fdisk/sfdisk.c:1148
#, c-format
msgid "Warning: partition %s "
-msgstr ""
+msgstr "Hoiatus: partitsioon %s "
#: fdisk/sfdisk.c:1149
#, c-format
msgid "is not contained in partition %s\n"
-msgstr ""
+msgstr "ei sisaldu partitsioonis %s\n"
#: fdisk/sfdisk.c:1160
#, c-format
msgid "Warning: partitions %s "
-msgstr ""
+msgstr "Hoiatus: partitsioonid %s "
#: fdisk/sfdisk.c:1161
#, c-format
msgid "and %s overlap\n"
-msgstr ""
+msgstr "ja %s kattuvad\n"
#: fdisk/sfdisk.c:1172
#, c-format
@@ -4184,6 +4471,8 @@ msgid ""
"Warning: partition %s contains part of the partition table (sector %lu),\n"
"and will destroy it when filled\n"
msgstr ""
+"Hoiatus: partitsioon %s sisaldab osa partitsioonitabelist (sektor %lu)\n"
+"ja hävitab selle, kui ta andmetega täidetakse\n"
#: fdisk/sfdisk.c:1184
#, c-format
@@ -4200,6 +4489,8 @@ msgid ""
"Among the primary partitions, at most one can be extended\n"
" (although this is not a problem under Linux)\n"
msgstr ""
+"Ainult üks primaarsetest partitsioonidest tohib olla extended\n"
+"(kuigi see pole Linuxis probleemiks)\n"
#: fdisk/sfdisk.c:1221
#, c-format
@@ -4216,18 +4507,26 @@ 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 ""
+"Hoiatus: rohkem kui üks primaarne partitsioon on märgitud buutivaks "
+"(aktiivseks).\n"
+"LILO jaoks pole see oluline, aga DOS-i MBR võib buutimisel raskustesse "
+"sattuda.\n"
#: fdisk/sfdisk.c:1252
msgid ""
"Warning: usually one can boot from primary partitions only\n"
"LILO disregards the `bootable' flag.\n"
msgstr ""
+"Hoiatus: harilikult saab buutida ainult primaarsetelt partitsioonidelt,\n"
+"ainult LILO ignoreerib buuditavuse lippu.\n"
#: fdisk/sfdisk.c:1258
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 ""
+"Hoiatus: ükski primaarne partitsioon pole märgitud buutivaks (aktiivseks).\n"
+"See pole LILO jaoks oluline, aga DOS-i MBR ei suuda siit kettalt buutida.\n"
#: fdisk/sfdisk.c:1275
#, c-format
@@ -4257,6 +4556,8 @@ msgid ""
"Warning: extended partition does not start at a cylinder boundary.\n"
"DOS and Linux will interpret the contents differently.\n"
msgstr ""
+"Hoiatus: extended partitsioon ei alga silindri piirilt.\n"
+"DOS ja Linux interpreteerivad selle sisu erinevalt.\n"
#: fdisk/sfdisk.c:1336 fdisk/sfdisk.c:1413
#, c-format
@@ -4794,138 +5095,124 @@ msgstr ""
msgid "internal error, contact the author."
msgstr ""
-#: hwclock/cmos.c:168
+#: hwclock/cmos.c:172
msgid "booted from MILO\n"
msgstr "buuditud MILO'st\n"
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:181
msgid "Ruffian BCD clock\n"
msgstr "Ruffiani BCD kell\n"
-#: hwclock/cmos.c:193
+#: hwclock/cmos.c:197
#, c-format
msgid "clockport adjusted to 0x%x\n"
msgstr "kella port parandatud aadressiks 0x%x\n"
-#: hwclock/cmos.c:205
+#: hwclock/cmos.c:209
msgid "funky TOY!\n"
msgstr "Vinge masin!\n"
-#: hwclock/cmos.c:259
+#: hwclock/cmos.c:263
#, c-format
msgid "%s: atomic %s failed for 1000 iterations!"
msgstr "%s: atomaarne '%s' ei õnnestunud 1000 katse jooksul!"
-#: hwclock/cmos.c:583
+#: hwclock/cmos.c:587
#, c-format
msgid "Cannot open /dev/port: %s"
msgstr "Ei suuda avada seadet /dev/port: %s"
-#: hwclock/cmos.c:590
+#: hwclock/cmos.c:594
msgid "I failed to get permission because I didn't try.\n"
msgstr "Ei saanud luba, sest ei küsinudki\n"
-#: hwclock/cmos.c:593
+#: hwclock/cmos.c:597
#, c-format
msgid "%s is unable to get I/O port access: the iopl(3) call failed.\n"
msgstr "%s ei saanud I/O portidele ligi: iopl(3) ei õnnestunud\n"
-#: hwclock/cmos.c:596
+#: hwclock/cmos.c:600
msgid "Probably you need root privileges.\n"
msgstr "Ilmselt on vaja roodu õigusi\n"
-#: hwclock/hwclock.c:219
+#: hwclock/hwclock.c:223
#, c-format
msgid "Assuming hardware clock is kept in %s time.\n"
msgstr "Eeldan, et riistavalises kellas on kasutusel %s aeg\n"
-#: hwclock/hwclock.c:220 hwclock/hwclock.c:314
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
msgid "UTC"
msgstr "UTC"
-#: hwclock/hwclock.c:220 hwclock/hwclock.c:313
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
msgid "local"
msgstr "kohalik"
-#: hwclock/hwclock.c:297
+#: hwclock/hwclock.c:303
#, c-format
msgid "%s: Warning: unrecognized third line in adjtime file\n"
msgstr "%s: Hoiatus: arusaamatu kolmas rida adjtime failis\n"
-#: hwclock/hwclock.c:299
+#: hwclock/hwclock.c:305
msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
msgstr "(Ootasin: `UTC' või `LOCAL' või mitte midagi)\n"
-#: hwclock/hwclock.c:308
+#: hwclock/hwclock.c:312
#, c-format
msgid "Last drift adjustment done at %ld seconds after 1969\n"
msgstr "Viimane ujumise vastane parandus tehti %ld sekundit pärast 1969\n"
-#: hwclock/hwclock.c:310
+#: hwclock/hwclock.c:314
#, c-format
msgid "Last calibration done at %ld seconds after 1969\n"
msgstr "Viimane kalibreerimine tehti %ld sekundit pärast 1969\n"
-#: hwclock/hwclock.c:312
+#: hwclock/hwclock.c:316
#, c-format
msgid "Hardware clock is on %s time\n"
msgstr "Riistvaralises kellas on kasutusel %s aeg\n"
-#: hwclock/hwclock.c:314
+#: hwclock/hwclock.c:318
msgid "unknown"
msgstr "tundmatu"
-#. -----------------------------------------------------------------------------
-#. 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.
-#.
-#. -----------------------------------------------------------------------------
-#: hwclock/hwclock.c:336
+#: hwclock/hwclock.c:342
msgid "Waiting for clock tick...\n"
msgstr "Ootan kella tiksu...\n"
-#: hwclock/hwclock.c:340
+#: hwclock/hwclock.c:346
msgid "...got clock tick\n"
msgstr "...sain tiksu\n"
-#: hwclock/hwclock.c:391
+#: hwclock/hwclock.c:399
#, c-format
msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
msgstr ""
"Vigased väärtused riistvaralises kellas: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
-#: hwclock/hwclock.c:399
+#: hwclock/hwclock.c:407
#, c-format
msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
msgstr ""
"Riistvaralise kella aeg: %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld sekundit pärast "
"1969\n"
-#: hwclock/hwclock.c:427
+#: hwclock/hwclock.c:435
#, c-format
msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
msgstr "Riistvaralisest kellast loetud aeg: %4d/%.2d/%.2d %02d:%02d:%02d\n"
-#: hwclock/hwclock.c:454
+#: hwclock/hwclock.c:462
#, c-format
msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
msgstr ""
"Sean riistavaralise kella näiduks %.2d:%.2d:%.2d = %ld sekundit pärast 1969\n"
-#: hwclock/hwclock.c:460
+#: hwclock/hwclock.c:468
msgid "Clock not changed - testing only.\n"
msgstr "Ei muutnud kella - testime ainult\n"
-#: hwclock/hwclock.c:508
+#: hwclock/hwclock.c:516
#, c-format
msgid ""
"Time elapsed since reference time has been %.6f seconds.\n"
@@ -4934,7 +5221,7 @@ msgstr ""
"Seatavast kellaajast on möödas %.6f sekundit.\n"
"Ootan edasi täissekundini.\n"
-#: hwclock/hwclock.c:532
+#: hwclock/hwclock.c:540
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"
@@ -4943,20 +5230,20 @@ msgstr ""
"kuupäev) või on nad väljaspool meie poolt kasutatavat ajavahemikku (näiteks "
"aasta 2005)\n"
-#: hwclock/hwclock.c:542
+#: hwclock/hwclock.c:550
#, c-format
msgid "%s %.6f seconds\n"
msgstr "%s %.6f sekundit\n"
-#: hwclock/hwclock.c:576
+#: hwclock/hwclock.c:584
msgid "No --date option specified.\n"
msgstr "--date parameeter on puudu\n"
-#: hwclock/hwclock.c:582
+#: hwclock/hwclock.c:590
msgid "--date argument too long\n"
msgstr "--date argument on liiga pikk\n"
-#: hwclock/hwclock.c:589
+#: hwclock/hwclock.c:597
msgid ""
"The value of the --date option is not a valid date.\n"
"In particular, it contains quotation marks.\n"
@@ -4964,21 +5251,21 @@ msgstr ""
"--date suvandiga antud kellaaeg on vigane.\n"
"Täpsemalt öeldes sisaldab ta jutumärke.\n"
-#: hwclock/hwclock.c:597
+#: hwclock/hwclock.c:605
#, c-format
msgid "Issuing date command: %s\n"
msgstr "Annan `date' käsu: %s\n"
-#: hwclock/hwclock.c:601
+#: hwclock/hwclock.c:609
msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
msgstr "Ei suuda käivatada 'date' programmi /bin/sh shelliga - popen() sai vea"
-#: hwclock/hwclock.c:609
+#: hwclock/hwclock.c:617
#, c-format
msgid "response from date command = %s\n"
msgstr "date-käsu tulemus = %s\n"
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:619
#, c-format
msgid ""
"The date command issued by %s returned unexpected results.\n"
@@ -4993,7 +5280,7 @@ msgstr ""
"Vastus oli:\n"
" %s\n"
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:631
#, c-format
msgid ""
"The date command issued by %s returned something other than an integer where "
@@ -5010,12 +5297,12 @@ msgstr ""
"Vastus oli:\n"
" %s\n"
-#: hwclock/hwclock.c:634
+#: hwclock/hwclock.c:642
#, c-format
msgid "date string %s equates to %ld seconds since 1969.\n"
msgstr "kuupäevastring %s võrdub %ld sekundiga pärast 1969\n"
-#: hwclock/hwclock.c:666
+#: hwclock/hwclock.c:674
msgid ""
"The Hardware Clock does not contain a valid time, so we cannot set the "
"System Time from it.\n"
@@ -5023,40 +5310,49 @@ msgstr ""
"Riistavaline kell ei sisalda korrektset aega, seega me ei saa seada "
"süsteemikella selle järgi\n"
-#: hwclock/hwclock.c:688
+#: hwclock/hwclock.c:696
msgid "Calling settimeofday:\n"
msgstr "kutsun välja settimeofday:\n"
-#: hwclock/hwclock.c:689
+#: hwclock/hwclock.c:697
#, c-format
msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
-#: hwclock/hwclock.c:691
+#: hwclock/hwclock.c:699
#, c-format
msgid "\ttz.tz_minuteswest = %d\n"
msgstr "\ttz.tz_minuteswest = %d\n"
-#: hwclock/hwclock.c:694
+#: hwclock/hwclock.c:702
msgid "Not setting system clock because running in test mode.\n"
msgstr "Ei sea süsteemikella, sest tegu on testimisega\n"
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:711
msgid "Must be superuser to set system clock.\n"
msgstr "Kella seadmiseks peab olema root\n"
-#: hwclock/hwclock.c:704
+#: hwclock/hwclock.c:714
msgid "settimeofday() failed"
msgstr "settimeofday() ei õnnestunud"
-#: hwclock/hwclock.c:737
+#: hwclock/hwclock.c:744
msgid ""
"Not adjusting drift factor because the Hardware Clock previously contained "
"garbage.\n"
msgstr ""
"Ei paranda korrigeerimistegurit, kuna riistvaraline kell sisaldas sodi\n"
-#: hwclock/hwclock.c:741
+#: hwclock/hwclock.c:749
+#, fuzzy
+msgid ""
+"Not adjusting drift factor because last calibration time is zero,\n"
+"so history is bad and calibration startover is necessary.\n"
+msgstr ""
+"Ei paranda korrigeerimistegurit, kuna viimane kalibreerimine toimus vähem "
+"kui ööpäev tagasi\n"
+
+#: hwclock/hwclock.c:755
msgid ""
"Not adjusting drift factor because it has been less than a day since the "
"last calibration.\n"
@@ -5064,10 +5360,10 @@ msgstr ""
"Ei paranda korrigeerimistegurit, kuna viimane kalibreerimine toimus vähem "
"kui ööpäev tagasi\n"
-#: hwclock/hwclock.c:750
-#, c-format
+#: hwclock/hwclock.c:803
+#, fuzzy, c-format
msgid ""
-"Clock drifted %d seconds in the past %d seconds in spite of a drift factor "
+"Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
"of %f seconds/day.\n"
"Adjusting drift factor by %f seconds/day\n"
msgstr ""
@@ -5075,21 +5371,22 @@ msgstr ""
"korrigeerimistegurile %f sekundit päevas.\n"
"Paranen korrigeerimisfaktoriks %f sekundit päevas.\n"
-#: hwclock/hwclock.c:801
+#: hwclock/hwclock.c:854
#, c-format
msgid "Time since last adjustment is %d seconds\n"
msgstr "Viimasest kellaaja korrigeermisest on möödunud %d sekundit\n"
-#: hwclock/hwclock.c:803
+#: hwclock/hwclock.c:856
#, c-format
msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
msgstr ""
+"Vaja ob vahele lisada %d sekundit ning viidata ajale %.6f sekundit tagasi\n"
-#: hwclock/hwclock.c:832
+#: hwclock/hwclock.c:885
msgid "Not updating adjtime file because of testing mode.\n"
msgstr "Ei uuenda adjtime faili, sest tegu on testimisega\n"
-#: hwclock/hwclock.c:833
+#: hwclock/hwclock.c:886
#, c-format
msgid ""
"Would have written the following to %s:\n"
@@ -5098,35 +5395,35 @@ msgstr ""
"Oleks kirjutanud faili %s järgmist:\n"
"%s"
-#: hwclock/hwclock.c:857
+#: hwclock/hwclock.c:910
msgid "Drift adjustment parameters not updated.\n"
msgstr "Ujumise kompenseerimise parameetreid ei uuendatud\n"
-#: hwclock/hwclock.c:898
+#: hwclock/hwclock.c:951
msgid ""
"The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
msgstr ""
"Riistvaraline kell ei sisalda korrektset aega, seega me ei saa sinna "
"parandust lisada\n"
-#: hwclock/hwclock.c:922
+#: hwclock/hwclock.c:983
msgid "Needed adjustment is less than one second, so not setting clock.\n"
msgstr "Vajalik parandus on alla sekundi, seega kella ei sea\n"
-#: hwclock/hwclock.c:948
+#: hwclock/hwclock.c:1009
#, c-format
msgid "Using %s.\n"
msgstr "Kasutan %s\n"
-#: hwclock/hwclock.c:950
+#: hwclock/hwclock.c:1011
msgid "No usable clock interface found.\n"
msgstr "Ei leidnud kasutatavat kellaliidest\n"
-#: hwclock/hwclock.c:1045
+#: hwclock/hwclock.c:1107
msgid "Unable to set system clock.\n"
msgstr "Süsteemikella seadmine ei õnnestunud\n"
-#: hwclock/hwclock.c:1076
+#: hwclock/hwclock.c:1137
msgid ""
"The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
"machine.\n"
@@ -5137,16 +5434,16 @@ msgstr ""
"See koopia hwclock'ist on kompileeritud töötama muul masinal (ja seega\n"
"ilmselt ei tööta hetkel Alpha peal). Ei võta midagi ette.\n"
-#: hwclock/hwclock.c:1085
+#: hwclock/hwclock.c:1146
msgid "Unable to get the epoch value from the kernel.\n"
msgstr "Ei saanud tuumalt epohhi väärtust kätte\n"
-#: hwclock/hwclock.c:1087
+#: hwclock/hwclock.c:1148
#, c-format
msgid "Kernel is assuming an epoch value of %lu\n"
msgstr "Tuum kasutab epohhi väärtust %lu\n"
-#: hwclock/hwclock.c:1090
+#: hwclock/hwclock.c:1151
msgid ""
"To set the epoch value, you must use the 'epoch' option to tell to what "
"value to set it.\n"
@@ -5154,16 +5451,16 @@ msgstr ""
"Epohhi väärtuse seadmiseks peate kasutama `epoch' võtit uue väärtuse "
"andmiseks\n"
-#: hwclock/hwclock.c:1093
+#: hwclock/hwclock.c:1154
#, c-format
msgid "Not setting the epoch to %d - testing only.\n"
msgstr "Ei pannud epohhiks %d - testime ainult\n"
-#: hwclock/hwclock.c:1096
+#: hwclock/hwclock.c:1157
msgid "Unable to set the epoch value in the kernel.\n"
msgstr "Epohhi väärtuse seadmine ei õnnestunud\n"
-#: hwclock/hwclock.c:1125
+#: hwclock/hwclock.c:1191
#, c-format
msgid ""
"hwclock - query and set the hardware clock (RTC)\n"
@@ -5222,7 +5519,7 @@ msgstr ""
" --noadjfile mitte kasutada faili /etc/adjtime. Vajab kas --utc või\n"
" --localtime võtit\n"
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1218
msgid ""
" --jensen, --arc, --srm, --funky-toy\n"
" tell hwclock the type of alpha you have (see hwclock(8))\n"
@@ -5231,18 +5528,19 @@ msgstr ""
" ütleb hwclock'ile, mis tüüpi Alphaga on tegemist\n"
" Vt. hwclock(8) lähema info jaoks\n"
-#: hwclock/hwclock.c:1257
+#: hwclock/hwclock.c:1392
#, c-format
msgid "%s takes no non-option arguments. You supplied %d.\n"
msgstr "%s ei taha mitte-võtmelisi argumente. %d on üleliigne\n"
-#: hwclock/hwclock.c:1267
+#: hwclock/hwclock.c:1398
+#, fuzzy
msgid ""
-"You have specified multiple function options.\n"
+"You have specified multiple functions.\n"
"You can only perform one function at a time.\n"
msgstr "Korraga saab kasutada ainult ühte funktsiooni\n"
-#: hwclock/hwclock.c:1273
+#: hwclock/hwclock.c:1405
#, c-format
msgid ""
"%s: The --utc and --localtime options are mutually exclusive. You specified "
@@ -5251,137 +5549,132 @@ msgstr ""
"%s: --utc ja --localtime võtmed on teineteist välistavad. Teie kasutasite "
"mõlemat korraga\n"
-#: hwclock/hwclock.c:1279
+#: hwclock/hwclock.c:1412
#, c-format
msgid ""
"%s: The --adjust and --noadjfile options are mutually exclusive. You "
"specified both.\n"
msgstr "%s: Võtmed --adjust ja --noadjfile on vastastikku välistavad\n"
-#: hwclock/hwclock.c:1285
+#: hwclock/hwclock.c:1419
#, c-format
msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
msgstr ""
"%s: Koos võtmega --noadjfile tuleb anda ka kas --utc või --localtime võti\n"
-#: hwclock/hwclock.c:1298
+#: hwclock/hwclock.c:1433
msgid "No usable set-to time. Cannot set clock.\n"
msgstr "Ei saanud kasutatavat aega, ei keera kella\n"
-#: hwclock/hwclock.c:1313
+#: hwclock/hwclock.c:1449
msgid "Sorry, only the superuser can change the Hardware Clock.\n"
msgstr "Kahjuks saab ainult root riistvaralist kella keerata\n"
-#: hwclock/hwclock.c:1317
+#: hwclock/hwclock.c:1454
msgid "Sorry, only the superuser can change the System Clock.\n"
msgstr "Kahjuks saba ainult root süsteemikelal keerata\n"
-#: hwclock/hwclock.c:1321
+#: hwclock/hwclock.c:1459
msgid ""
"Sorry, only the superuser can change the Hardware Clock epoch in the "
"kernel.\n"
msgstr "Kahjuks saab ainult root riistvaralise kella epohhi seada\n"
-#: hwclock/hwclock.c:1341
+#: hwclock/hwclock.c:1479
msgid "Cannot access the Hardware Clock via any known method.\n"
msgstr "Ei suuda ühegi tuntud meetodiga riistvaralist kella kätte saada\n"
-#: hwclock/hwclock.c:1344
+#: hwclock/hwclock.c:1483
msgid ""
"Use the --debug option to see the details of our search for an access "
"method.\n"
msgstr ""
"Kasutage --debug võtit, et näha otsingu detaile juurdepääsu otsimisel\n"
-#: hwclock/kd.c:42
+#: hwclock/kd.c:43
msgid "Waiting in loop for time from KDGHWCLK to change\n"
msgstr "Ootan tsükils, kuni KDGHWCLK abil saadud aeg edasi läheb\n"
-#: hwclock/kd.c:45
+#: hwclock/kd.c:46
msgid "KDGHWCLK ioctl to read time failed"
msgstr "KDGHWCLK ioctl kella lugemiseks ei õnnestunud"
-#: hwclock/kd.c:66 hwclock/rtc.c:174
+#: hwclock/kd.c:67 hwclock/rtc.c:187
msgid "Timed out waiting for time change.\n"
msgstr "Taimaut oodates kellaaja muutumist\n"
-#: hwclock/kd.c:70
+#: hwclock/kd.c:71
msgid "KDGHWCLK ioctl to read time failed in loop"
msgstr "KDGHWCLK ioctl kella lugemiseks ei õnnestunud tsükils"
-#: hwclock/kd.c:92
+#: hwclock/kd.c:93
#, c-format
msgid "ioctl() failed to read time from %s"
msgstr "ioctl() abil kella lugemine %s kaudu ei õnnestunud"
-#: hwclock/kd.c:128
+#: hwclock/kd.c:129
msgid "ioctl KDSHWCLK failed"
msgstr "KDSHWCLK ioctl ei õnnestunud"
-#: hwclock/kd.c:165
+#: hwclock/kd.c:166
msgid "Can't open /dev/tty1 or /dev/vc/1"
msgstr "Ei suuda avada seadet /dev/tty1 või /dev/vc/1"
-#: hwclock/kd.c:170
+#: hwclock/kd.c:171
msgid "KDGHWCLK ioctl failed"
msgstr "KDGHWCLK ioctl ei õnnestunud"
-#: hwclock/rtc.c:136
+#: hwclock/rtc.c:115 hwclock/rtc.c:208
+#, c-format
+msgid "open() of %s failed"
+msgstr "%s avamine ei õnnestunud"
+
+#: hwclock/rtc.c:149
#, c-format
msgid "ioctl() to %s to read the time failed.\n"
msgstr "ioctl() abil kella lugemine %s kaudu ei õnnestnud\n"
-#: hwclock/rtc.c:158
+#: hwclock/rtc.c:171
#, c-format
msgid "Waiting in loop for time from %s to change\n"
msgstr "Ootan tsükils, kuni %s kaudu saadud aeg edasi läheb\n"
-#: hwclock/rtc.c:195 hwclock/rtc.c:250
-#, c-format
-msgid "open() of %s failed"
-msgstr "%s avamine ei õnnestunud"
-
-#: hwclock/rtc.c:213
+#: hwclock/rtc.c:226
#, c-format
msgid "%s does not have interrupt functions. "
msgstr "%s ei paku katkestusfunktsioone. "
-#: hwclock/rtc.c:222
+#: hwclock/rtc.c:235
#, c-format
msgid "read() to %s to wait for clock tick failed"
msgstr "%s lugemine kella tiksu ootamisel ei õnnestunud"
-#: hwclock/rtc.c:231
+#: hwclock/rtc.c:244
#, c-format
msgid "ioctl() to %s to turn off update interrupts failed"
msgstr "%s ioctl() abil ei õnnestunud välja lülitada kella katkestusi"
-#: hwclock/rtc.c:234
+#: hwclock/rtc.c:247
#, c-format
msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
msgstr "%s ioctl() abil ei õnnestunud sisse lülitada kella katkestusi"
-#: hwclock/rtc.c:274 hwclock/rtc.c:358 hwclock/rtc.c:404
-#, c-format
-msgid "Unable to open %s"
-msgstr "Ei suuda avada seadet %s"
-
-#: hwclock/rtc.c:300
+#: hwclock/rtc.c:306
#, c-format
msgid "ioctl() to %s to set the time failed.\n"
msgstr "ioctl() %s kaudu kella seadmiseks ei õnnestunud\n"
-#: hwclock/rtc.c:306
+#: hwclock/rtc.c:312
#, c-format
msgid "ioctl(%s) was successful.\n"
msgstr "ioctl(%s) õnnestus\n"
-#: hwclock/rtc.c:335
+#: hwclock/rtc.c:341
#, c-format
msgid "Open of %s failed"
msgstr "%s avamine ei õnnestunud"
-#: hwclock/rtc.c:353 hwclock/rtc.c:399
+#: hwclock/rtc.c:359 hwclock/rtc.c:405
#, c-format
msgid ""
"To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
@@ -5391,12 +5684,17 @@ msgstr ""
"Epohhi väärtuse manipuleerimiseks tuleb kasutada 'rtc' draiverit seadmefaili "
"%s kaudu. Antud süsteemis seda faili ei leidu\n"
-#: hwclock/rtc.c:365
+#: hwclock/rtc.c:364 hwclock/rtc.c:410
+#, c-format
+msgid "Unable to open %s"
+msgstr "Ei suuda avada seadet %s"
+
+#: hwclock/rtc.c:371
#, c-format
msgid "ioctl(RTC_EPOCH_READ) to %s failed"
msgstr "%s ioctl(RTC_EPOCH_READ) ei õnnestunud"
-#: hwclock/rtc.c:371
+#: hwclock/rtc.c:377
#, c-format
msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
msgstr "lugesime epohhi %ld %s kaudu RTC_EPOCH_READ ioctl abil\n"
@@ -5404,57 +5702,27 @@ msgstr "lugesime epohhi %ld %s kaudu RTC_EPOCH_READ ioctl abil\n"
#. kernel would not accept this epoch value
#. Hmm - bad habit, deciding not to do what the user asks
#. just because one believes that the kernel might not like it.
-#: hwclock/rtc.c:391
+#: hwclock/rtc.c:397
#, c-format
msgid "The epoch value may not be less than 1900. You requested %ld\n"
msgstr "Epohhi väärtus ei tohi olla alla 1900. Teie andsite %ld\n"
-#: hwclock/rtc.c:409
+#: hwclock/rtc.c:415
#, c-format
msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
msgstr "sean epohhiks %ld %s RTC_EPOCH_SET ioctl abil\n"
-#: hwclock/rtc.c:414
+#: hwclock/rtc.c:420
#, c-format
msgid ""
"The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
msgstr "Tuuma draiver %s jaoks ei toeta RTC_EPOCH_SET ioctl'i\n"
-#: hwclock/rtc.c:417
+#: hwclock/rtc.c:423
#, c-format
msgid "ioctl(RTC_EPOCH_SET) to %s failed"
msgstr "%s ioctl(RTC_EPOCH_SET) ei õnnestunud"
-#: hwclock/shhopt.c:255 hwclock/shhopt.c:281
-#, c-format
-msgid "invalid number `%s'\n"
-msgstr "vigane arv: %s\n"
-
-#: hwclock/shhopt.c:258 hwclock/shhopt.c:284
-#, c-format
-msgid "number `%s' to `%s' out of range\n"
-msgstr "arv `%s' võtmele `%s' on väljaspool lubatud vahemikku\n"
-
-#: hwclock/shhopt.c:398
-#, c-format
-msgid "unrecognized option `%s'\n"
-msgstr "tundmatu võti `%s'\n"
-
-#: hwclock/shhopt.c:411 hwclock/shhopt.c:449
-#, c-format
-msgid "option `%s' requires an argument\n"
-msgstr "võti `%s' vajab argumenti\n"
-
-#: hwclock/shhopt.c:417
-#, c-format
-msgid "option `%s' doesn't allow an argument\n"
-msgstr "võti `%s' ei luba argumente\n"
-
-#: hwclock/shhopt.c:439
-#, c-format
-msgid "unrecognized option `-%c'\n"
-msgstr "tundmatu võti `-%c'\n"
-
#: login-utils/agetty.c:312
msgid "calling open_tty\n"
msgstr "kutsun välja funktsiooni open_tty\n"
@@ -6310,7 +6578,7 @@ msgstr "See paistab olevat homme, kes tõesti ei saa niikaua oodata?\n"
#: login-utils/shutdown.c:307
msgid "for maintenance; bounce, bounce"
-msgstr ""
+msgstr "hoolduse jaoks (nagu ikka)"
#: login-utils/shutdown.c:311
#, c-format
@@ -6328,12 +6596,12 @@ msgstr "Sisse logimine on seetõttu keelatud"
#: login-utils/shutdown.c:362
#, c-format
msgid "rebooted by %s: %s"
-msgstr ""
+msgstr "buutis %s: %s"
#: login-utils/shutdown.c:365
#, c-format
msgid "halted by %s: %s"
-msgstr ""
+msgstr "seiskas %s: %s"
#. RB_AUTOBOOT
#: login-utils/shutdown.c:429
@@ -6354,7 +6622,7 @@ msgstr ""
#: login-utils/shutdown.c:447
msgid "Calling kernel power-off facility...\n"
-msgstr ""
+msgstr "Kutsun välja tuuma väljalülitamise meetodi...\n"
#: login-utils/shutdown.c:450
#, c-format
@@ -6484,7 +6752,7 @@ msgstr "kataloogi avamine ei õnnestunud\n"
msgid "fork failed\n"
msgstr "fork ei õnnestunud\n"
-#: login-utils/simpleinit.c:512 text-utils/more.c:1705
+#: login-utils/simpleinit.c:512 text-utils/more.c:1706
msgid "exec failed\n"
msgstr "exec ei õnnestunud\n"
@@ -6581,45 +6849,45 @@ msgstr ""
#: login-utils/wall.c:104
#, c-format
msgid "usage: %s [file]\n"
-msgstr ""
+msgstr "Kasutamine: %s [fail]\n"
#: login-utils/wall.c:159
#, c-format
msgid "%s: can't open temporary file.\n"
-msgstr ""
+msgstr "%s: ei suuda avada ajutist faili\n"
#: login-utils/wall.c:186
#, c-format
msgid "Broadcast Message from %s@%s"
-msgstr ""
+msgstr "Teade kõigile kasutajalt %s@%s"
#: login-utils/wall.c:204
#, c-format
msgid "%s: will not read %s - use stdin.\n"
-msgstr ""
+msgstr "%s: ei hakka %s lugema, kasuta standardsisendit\n"
#: login-utils/wall.c:209
#, c-format
msgid "%s: can't read %s.\n"
-msgstr ""
+msgstr "%s: ei suuda lugeda %s\n"
#: login-utils/wall.c:231
#, c-format
msgid "%s: can't stat temporary file.\n"
-msgstr ""
+msgstr "%s: ei suuda lugeda ajutise faili staatust\n"
#: login-utils/wall.c:241
#, c-format
msgid "%s: can't read temporary file.\n"
-msgstr ""
+msgstr "%s: ei suuda lugeda ajutist faili\n"
#: misc-utils/cal.c:260
msgid "illegal month value: use 1-12"
-msgstr ""
+msgstr "Vigane kuu number, lubatud on 1-12"
#: misc-utils/cal.c:264
msgid "illegal year value: use 1-9999"
-msgstr ""
+msgstr "Vigane aasta number, lubatud on 1-9999"
#. %s is the month name, %d the year number.
#. * you can change the order and/or add something her; eg for
@@ -6629,80 +6897,82 @@ msgstr ""
#: misc-utils/cal.c:371
#, c-format
msgid "%s %d"
-msgstr ""
+msgstr "%s %d"
#: misc-utils/cal.c:674
msgid "usage: cal [-13smjyV] [[month] year]\n"
-msgstr ""
+msgstr "Kasutamine: cal [-13smjyV] [[kuu] aasta]\n"
#: misc-utils/ddate.c:205
#, c-format
msgid "usage: %s [+format] [day month year]\n"
-msgstr ""
+msgstr "Kasutamine: %s[+formaat] [kuupäev kuu aasta]\n"
#. handle St. Tib's Day
#: misc-utils/ddate.c:252
msgid "St. Tib's Day"
-msgstr ""
+msgstr "Püha Tib'i päev"
#: misc-utils/kill.c:206
#, c-format
msgid "%s: unknown signal %s\n"
-msgstr ""
+msgstr "%s: tundmatu signaal %s\n"
#: misc-utils/kill.c:269
#, c-format
msgid "%s: can't find process \"%s\"\n"
-msgstr ""
+msgstr "%s: ei leia protsessi \"%s\"\n"
#: misc-utils/kill.c:313
#, c-format
msgid "%s: unknown signal %s; valid signals:\n"
-msgstr ""
+msgstr "%s: tundmatu signaal %s, tuntud signaalid:\n"
#: misc-utils/kill.c:353
#, c-format
msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
-msgstr ""
+msgstr "Kasutamine: %s [ -s signaal | -p ] [ -a ] pid ...\n"
#: misc-utils/kill.c:354
#, c-format
msgid " %s -l [ signal ]\n"
-msgstr ""
+msgstr " %s -l [ signaal ]\n"
#: misc-utils/logger.c:140
#, c-format
msgid "logger: %s: %s.\n"
-msgstr ""
+msgstr "logger: %s: %s\n"
#: misc-utils/logger.c:247
#, c-format
msgid "logger: unknown facility name: %s.\n"
-msgstr ""
+msgstr "logger: tundmatu kategooria nimi: %s\n"
#: misc-utils/logger.c:259
#, c-format
msgid "logger: unknown priority name: %s.\n"
-msgstr ""
+msgstr "logger: tundmatu prioriteedi nimi: %s\n"
#: misc-utils/logger.c:286
msgid ""
"usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
msgstr ""
+"Kasutamine: logger [-is] [-f fail] [-p pri] [-t nimi] [-u sokkel] "
+"[ teade ... ]\n"
#: misc-utils/look.c:348
msgid "usage: look [-dfa] [-t char] string [file]\n"
-msgstr ""
+msgstr "Kasutamine: look [-dfa] [-t märk] string [fail]\n"
#: misc-utils/mcookie.c:122 misc-utils/mcookie.c:149
#, c-format
msgid "Could not open %s\n"
-msgstr ""
+msgstr "Ei suutnud avada %s\n"
#: misc-utils/mcookie.c:126 misc-utils/mcookie.c:145
#, c-format
msgid "Got %d bytes from %s\n"
-msgstr ""
+msgstr "Sain %d baiti %s seest\n"
#: misc-utils/namei.c:102
#, c-format
@@ -6757,12 +7027,12 @@ msgstr "%s: Mälu sai otsa\n"
#: misc-utils/rename.c:56
#, c-format
msgid "%s: renaming %s to %s failed: %s\n"
-msgstr ""
+msgstr "%s: %s ümber nimetamine %s -ks ei õnnestnud: %s\n"
#: misc-utils/rename.c:86
#, c-format
msgid "call: %s from to files...\n"
-msgstr ""
+msgstr "Kasutamine: %s kust kuhu failid...\n"
#: misc-utils/script.c:106
#, c-format
@@ -7003,54 +7273,56 @@ msgstr ""
#: misc-utils/whereis.c:157
msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
-msgstr ""
+msgstr "Kasutamine: whereis [ -sbmu ] [ -SBM kataloog ... -f ] nimi...\n"
#: misc-utils/write.c:99
msgid "write: can't find your tty's name\n"
-msgstr ""
+msgstr "write: ei leia Sinu terminaliseadme nime\n"
#: misc-utils/write.c:110
msgid "write: you have write permission turned off.\n"
-msgstr ""
+msgstr "write: Sul on kirjutamisõigus välja lülitatud\n"
#: misc-utils/write.c:131
#, c-format
msgid "write: %s is not logged in on %s.\n"
-msgstr ""
+msgstr "write: %s pole terminalilt %s sisse logitud\n"
#: misc-utils/write.c:139
#, c-format
msgid "write: %s has messages disabled on %s\n"
-msgstr ""
+msgstr "write: %s keeldub teadetest terminalil %s\n"
#: misc-utils/write.c:146
msgid "usage: write user [tty]\n"
-msgstr ""
+msgstr "Kasutamine: write kasutaja [tty]\n"
#: misc-utils/write.c:234
#, c-format
msgid "write: %s is not logged in\n"
-msgstr ""
+msgstr "write: %s pole sisse logitud\n"
#: misc-utils/write.c:243
#, c-format
msgid "write: %s has messages disabled\n"
-msgstr ""
+msgstr "write: %s keeldub teadetest\n"
#: misc-utils/write.c:247
#, c-format
msgid "write: %s is logged in more than once; writing to %s\n"
msgstr ""
+"write: %s on sisse logitud rohkem kui ühest kohast, kasutan tema terminali %"
+"s\n"
#: misc-utils/write.c:313
#, c-format
msgid "Message from %s@%s (as %s) on %s at %s ..."
-msgstr ""
+msgstr "Teade kasutajalt %s@%s (%s) terminalil %s kell %s..."
#: misc-utils/write.c:316
#, c-format
msgid "Message from %s@%s on %s at %s ..."
-msgstr ""
+msgstr "Teade kasutajalt %s@%s terminalil %s kell %s..."
#: mount/fstab.c:113
#, c-format
@@ -7244,309 +7516,313 @@ msgstr ""
msgid "; rest of file ignored"
msgstr ""
-#: mount/mount.c:379
+#: mount/mount.c:381
#, c-format
msgid "mount: according to mtab, %s is already mounted on %s"
msgstr ""
-#: mount/mount.c:383
+#: mount/mount.c:385
#, c-format
msgid "mount: according to mtab, %s is mounted on %s"
msgstr ""
-#: mount/mount.c:404
+#: mount/mount.c:406
#, c-format
msgid "mount: can't open %s for writing: %s"
msgstr ""
-#: mount/mount.c:419 mount/mount.c:638
+#: mount/mount.c:421 mount/mount.c:640
#, c-format
msgid "mount: error writing %s: %s"
msgstr ""
-#: mount/mount.c:426
+#: mount/mount.c:428
#, c-format
msgid "mount: error changing mode of %s: %s"
msgstr ""
-#: mount/mount.c:472
+#: mount/mount.c:474
#, c-format
msgid "%s looks like swapspace - not mounted"
msgstr ""
-#: mount/mount.c:532
+#: mount/mount.c:534
msgid "mount failed"
msgstr ""
-#: mount/mount.c:534
+#: mount/mount.c:536
#, c-format
msgid "mount: only root can mount %s on %s"
msgstr ""
-#: mount/mount.c:562
+#: mount/mount.c:564
msgid "mount: loop device specified twice"
msgstr ""
-#: mount/mount.c:567
+#: mount/mount.c:569
msgid "mount: type specified twice"
msgstr ""
-#: mount/mount.c:579
+#: mount/mount.c:581
msgid "mount: skipping the setup of a loop device\n"
msgstr ""
-#: mount/mount.c:588
+#: mount/mount.c:590
#, c-format
msgid "mount: going to use the loop device %s\n"
msgstr ""
-#: mount/mount.c:592
+#: mount/mount.c:594
msgid "mount: failed setting up loop device\n"
msgstr ""
-#: mount/mount.c:596
+#: mount/mount.c:598
msgid "mount: setup loop device successfully\n"
msgstr ""
-#: mount/mount.c:633
+#: mount/mount.c:635
#, c-format
msgid "mount: can't open %s: %s"
msgstr ""
-#: mount/mount.c:656
+#: mount/mount.c:658
#, c-format
msgid "mount: cannot open %s for setting speed"
msgstr "mount: ei suuda avada seadet %s kiiruse seadmiseks"
-#: mount/mount.c:659
+#: mount/mount.c:661
#, c-format
msgid "mount: cannot set speed: %s"
msgstr ""
-#: mount/mount.c:720 mount/mount.c:1265
+#: mount/mount.c:722 mount/mount.c:1295
#, c-format
msgid "mount: cannot fork: %s"
msgstr ""
-#: mount/mount.c:800
+#: mount/mount.c:802
msgid "mount: this version was compiled without support for the type `nfs'"
msgstr ""
-#: mount/mount.c:839
+#: mount/mount.c:841
msgid "mount: failed with nfs mount version 4, trying 3..\n"
msgstr ""
-#: mount/mount.c:850
+#: mount/mount.c:852
msgid ""
"mount: I could not determine the filesystem type, and none was specified"
msgstr ""
-#: mount/mount.c:853
+#: mount/mount.c:855
msgid "mount: you must specify the filesystem type"
msgstr ""
#. should not happen
-#: mount/mount.c:856
+#: mount/mount.c:858
msgid "mount: mount failed"
msgstr ""
-#: mount/mount.c:862 mount/mount.c:897
+#: mount/mount.c:864 mount/mount.c:899
#, c-format
msgid "mount: mount point %s is not a directory"
msgstr ""
-#: mount/mount.c:864
+#: mount/mount.c:866
msgid "mount: permission denied"
msgstr ""
-#: mount/mount.c:866
+#: mount/mount.c:868
msgid "mount: must be superuser to use mount"
msgstr ""
#. heuristic: if /proc/version exists, then probably proc is mounted
#. proc mounted?
-#: mount/mount.c:870 mount/mount.c:874
+#: mount/mount.c:872 mount/mount.c:876
#, c-format
msgid "mount: %s is busy"
msgstr ""
#. no
#. yes, don't mention it
-#: mount/mount.c:876
+#: mount/mount.c:878
msgid "mount: proc already mounted"
msgstr ""
-#: mount/mount.c:878
+#: mount/mount.c:880
#, c-format
msgid "mount: %s already mounted or %s busy"
msgstr ""
-#: mount/mount.c:884
+#: mount/mount.c:886
#, c-format
msgid "mount: mount point %s does not exist"
msgstr ""
-#: mount/mount.c:886
+#: mount/mount.c:888
#, c-format
msgid "mount: mount point %s is a symbolic link to nowhere"
msgstr ""
-#: mount/mount.c:889
+#: mount/mount.c:891
#, c-format
msgid "mount: special device %s does not exist"
msgstr ""
-#: mount/mount.c:899
+#: mount/mount.c:901
#, c-format
msgid ""
"mount: special device %s does not exist\n"
" (a path prefix is not a directory)\n"
msgstr ""
-#: mount/mount.c:912
+#: mount/mount.c:914
#, c-format
msgid "mount: %s not mounted already, or bad option"
msgstr ""
-#: mount/mount.c:914
+#: mount/mount.c:916
#, c-format
msgid ""
"mount: wrong fs type, bad option, bad superblock on %s,\n"
" or too many mounted file systems"
msgstr ""
-#: mount/mount.c:948
+#: mount/mount.c:950
msgid "mount table full"
msgstr ""
-#: mount/mount.c:950
+#: mount/mount.c:952
#, c-format
msgid "mount: %s: can't read superblock"
msgstr ""
-#: mount/mount.c:954
+#: mount/mount.c:956
#, c-format
msgid "mount: %s: unknown device"
msgstr ""
-#: mount/mount.c:959
+#: mount/mount.c:961
#, c-format
msgid "mount: fs type %s not supported by kernel"
msgstr ""
-#: mount/mount.c:971
+#: mount/mount.c:973
#, c-format
msgid "mount: probably you meant %s"
msgstr ""
-#: mount/mount.c:973
+#: mount/mount.c:975
msgid "mount: maybe you meant iso9660 ?"
msgstr ""
-#: mount/mount.c:976
+#: mount/mount.c:978
#, c-format
msgid "mount: %s has wrong device number or fs type %s not supported"
msgstr ""
#. strange ...
-#: mount/mount.c:982
+#: mount/mount.c:984
#, c-format
msgid "mount: %s is not a block device, and stat fails?"
msgstr ""
-#: mount/mount.c:984
+#: mount/mount.c:986
#, c-format
msgid ""
"mount: the kernel does not recognize %s as a block device\n"
" (maybe `insmod driver'?)"
msgstr ""
-#: mount/mount.c:987
+#: mount/mount.c:989
#, c-format
msgid "mount: %s is not a block device (maybe try `-o loop'?)"
msgstr ""
-#: mount/mount.c:990
+#: mount/mount.c:992
#, c-format
msgid "mount: %s is not a block device"
msgstr ""
-#: mount/mount.c:993
+#: mount/mount.c:995
#, c-format
msgid "mount: %s is not a valid block device"
msgstr ""
#. pre-linux 1.1.38, 1.1.41 and later
#. linux 1.1.38 and later
-#: mount/mount.c:996
+#: mount/mount.c:998
msgid "block device "
msgstr ""
-#: mount/mount.c:998
+#: mount/mount.c:1000
#, c-format
msgid "mount: cannot mount %s%s read-only"
msgstr ""
-#: mount/mount.c:1002
+#: mount/mount.c:1004
#, c-format
msgid "mount: %s%s is write-protected but explicit `-w' flag given"
msgstr ""
-#: mount/mount.c:1018
+#: mount/mount.c:1020
#, c-format
msgid "mount: %s%s is write-protected, mounting read-only"
msgstr ""
-#: mount/mount.c:1104
+#: mount/mount.c:1107
#, c-format
msgid "mount: the label %s occurs on both %s and %s\n"
msgstr ""
-#: mount/mount.c:1108
+#: mount/mount.c:1111
#, c-format
msgid "mount: %s duplicate - not mounted"
msgstr ""
-#: mount/mount.c:1118
+#: mount/mount.c:1121
#, c-format
msgid "mount: going to mount %s by %s\n"
msgstr ""
-#: mount/mount.c:1119
+#: mount/mount.c:1122
msgid "UUID"
msgstr ""
-#: mount/mount.c:1119
+#: mount/mount.c:1122
msgid "label"
msgstr ""
-#: mount/mount.c:1121 mount/mount.c:1521
+#: mount/mount.c:1124 mount/mount.c:1555
msgid "mount: no such partition found"
msgstr ""
-#: mount/mount.c:1129
+#: mount/mount.c:1132
msgid "mount: no type was given - I'll assume nfs because of the colon\n"
msgstr ""
+#: mount/mount.c:1137
+msgid "mount: no type was given - I'll assume smb because of the // prefix\n"
+msgstr ""
+
#.
#. * Retry in the background.
#.
-#: mount/mount.c:1145
+#: mount/mount.c:1153
#, c-format
msgid "mount: backgrounding \"%s\"\n"
msgstr ""
-#: mount/mount.c:1156
+#: mount/mount.c:1164
#, c-format
msgid "mount: giving up \"%s\"\n"
msgstr ""
-#: mount/mount.c:1216
+#: mount/mount.c:1240
#, c-format
msgid "mount: %s already mounted on %s\n"
msgstr ""
-#: mount/mount.c:1335
+#: mount/mount.c:1369
msgid ""
"Usage: mount -V : print version\n"
" mount -h : print this help\n"
@@ -7571,73 +7847,73 @@ msgid ""
"For many more details, say man 8 mount .\n"
msgstr ""
-#: mount/mount.c:1497
+#: mount/mount.c:1531
msgid "mount: only root can do that"
msgstr ""
-#: mount/mount.c:1502
+#: mount/mount.c:1536
#, c-format
msgid "mount: no %s found - creating it..\n"
msgstr ""
-#: mount/mount.c:1516
+#: mount/mount.c:1550
#, c-format
msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
msgstr ""
-#: mount/mount.c:1523
+#: mount/mount.c:1557
#, c-format
msgid "mount: mounting %s\n"
msgstr ""
-#: mount/mount.c:1532
+#: mount/mount.c:1566
msgid "nothing was mounted"
msgstr ""
-#: mount/mount.c:1547
+#: mount/mount.c:1581
#, c-format
msgid "mount: cannot find %s in %s"
msgstr ""
-#: mount/mount.c:1562
+#: mount/mount.c:1596
#, c-format
msgid "mount: can't find %s in %s or %s"
msgstr ""
-#: mount/mount_by_label.c:169
+#: mount/mount_by_label.c:199
#, c-format
msgid ""
"mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
msgstr ""
-#: mount/mount_by_label.c:295
+#: mount/mount_by_label.c:325
msgid "mount: bad UUID"
msgstr ""
-#: mount/mount_guess_fstype.c:487
+#: mount/mount_guess_fstype.c:482
msgid "mount: error while guessing filesystem type\n"
msgstr ""
-#: mount/mount_guess_fstype.c:496
+#: mount/mount_guess_fstype.c:491
#, c-format
msgid "mount: you didn't specify a filesystem type for %s\n"
msgstr ""
-#: mount/mount_guess_fstype.c:499
+#: mount/mount_guess_fstype.c:494
#, c-format
msgid " I will try all types mentioned in %s or %s\n"
msgstr ""
-#: mount/mount_guess_fstype.c:502
+#: mount/mount_guess_fstype.c:497
msgid " and it looks like this is swapspace\n"
msgstr ""
-#: mount/mount_guess_fstype.c:504
+#: mount/mount_guess_fstype.c:499
#, c-format
msgid " I will try type %s\n"
msgstr ""
-#: mount/mount_guess_fstype.c:592
+#: mount/mount_guess_fstype.c:587
#, c-format
msgid "Trying %s\n"
msgstr ""
@@ -7731,7 +8007,7 @@ msgstr ""
msgid "bug in xstrndup call"
msgstr ""
-#: mount/swapon.c:51
+#: mount/swapon.c:56
#, c-format
msgid ""
"usage: %s [-hV]\n"
@@ -7740,27 +8016,39 @@ msgid ""
" %s [-s]\n"
msgstr ""
-#: mount/swapon.c:88
+#: mount/swapon.c:66
+#, c-format
+msgid ""
+"usage: %s [-hV]\n"
+" %s -a [-v]\n"
+" %s [-v] special ...\n"
+msgstr ""
+
+#: mount/swapon.c:170 mount/swapon.c:234
#, c-format
msgid "%s on %s\n"
msgstr ""
-#: mount/swapon.c:93
+#: mount/swapon.c:174
#, c-format
msgid "swapon: cannot stat %s: %s\n"
msgstr ""
-#: mount/swapon.c:105
+#: mount/swapon.c:185
#, c-format
msgid "swapon: warning: %s has insecure permissions %04o, %04o suggested\n"
msgstr ""
-#: mount/swapon.c:115
+#: mount/swapon.c:197
#, c-format
msgid "swapon: Skipping file %s - it appears to have holes.\n"
msgstr ""
-#: mount/swapon.c:222
+#: mount/swapon.c:240
+msgid "Not superuser.\n"
+msgstr ""
+
+#: mount/swapon.c:298 mount/swapon.c:386
#, c-format
msgid "%s: cannot open %s: %s\n"
msgstr ""
@@ -8113,41 +8401,41 @@ msgstr "%s: %s (%s)\n"
msgid "%s: unknown argument: %s\n"
msgstr "%s: Tundmatu argument: %s\n"
-#: sys-utils/ipcs.c:122
+#: sys-utils/ipcs.c:121
#, c-format
msgid "usage : %s -asmq -tclup \n"
msgstr ""
-#: sys-utils/ipcs.c:123
+#: sys-utils/ipcs.c:122
#, c-format
msgid "\t%s [-s -m -q] -i id\n"
msgstr ""
-#: sys-utils/ipcs.c:124
+#: sys-utils/ipcs.c:123
#, c-format
msgid "\t%s -h for help.\n"
msgstr ""
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:129
#, c-format
msgid ""
"%s provides information on ipc facilities for which you have read access.\n"
msgstr ""
-#: sys-utils/ipcs.c:132
+#: sys-utils/ipcs.c:131
msgid ""
"Resource Specification:\n"
"\t-m : shared_mem\n"
"\t-q : messages\n"
msgstr ""
-#: sys-utils/ipcs.c:133
+#: sys-utils/ipcs.c:132
msgid ""
"\t-s : semaphores\n"
"\t-a : all (default)\n"
msgstr ""
-#: sys-utils/ipcs.c:134
+#: sys-utils/ipcs.c:133
msgid ""
"Output Format:\n"
"\t-t : time\n"
@@ -8155,499 +8443,494 @@ msgid ""
"\t-c : creator\n"
msgstr ""
-#: sys-utils/ipcs.c:135
+#: sys-utils/ipcs.c:134
msgid ""
"\t-l : limits\n"
"\t-u : summary\n"
msgstr ""
-#: sys-utils/ipcs.c:136
+#: sys-utils/ipcs.c:135
msgid "-i id [-s -q -m] : details on resource identified by id\n"
msgstr ""
-#: sys-utils/ipcs.c:268
+#: sys-utils/ipcs.c:267
msgid "kernel not configured for shared memory\n"
msgstr ""
-#: sys-utils/ipcs.c:274
+#: sys-utils/ipcs.c:273
msgid "------ Shared Memory Limits --------\n"
msgstr ""
#. glibc 2.1.3 and all earlier libc's have ints as fields
#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
-#: sys-utils/ipcs.c:279
+#: sys-utils/ipcs.c:278
#, c-format
msgid "max number of segments = %ld\n"
msgstr ""
-#: sys-utils/ipcs.c:281
+#: sys-utils/ipcs.c:280
#, c-format
msgid "max seg size (kbytes) = %ld\n"
msgstr ""
-#: sys-utils/ipcs.c:283
+#: sys-utils/ipcs.c:282
#, c-format
msgid "max total shared memory (kbytes) = %ld\n"
msgstr ""
-#: sys-utils/ipcs.c:285
+#: sys-utils/ipcs.c:284
#, c-format
msgid "min seg size (bytes) = %ld\n"
msgstr ""
-#: sys-utils/ipcs.c:290
+#: sys-utils/ipcs.c:289
msgid "------ Shared Memory Status --------\n"
msgstr ""
-#: sys-utils/ipcs.c:291
+#: sys-utils/ipcs.c:290
#, c-format
msgid "segments allocated %d\n"
msgstr ""
-#: sys-utils/ipcs.c:292
+#: sys-utils/ipcs.c:291
#, c-format
msgid "pages allocated %ld\n"
msgstr ""
-#: sys-utils/ipcs.c:293
+#: sys-utils/ipcs.c:292
#, c-format
msgid "pages resident %ld\n"
msgstr ""
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:293
#, c-format
msgid "pages swapped %ld\n"
msgstr ""
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:294
#, c-format
msgid "Swap performance: %ld attempts\t %ld successes\n"
msgstr ""
-#: sys-utils/ipcs.c:300
+#: sys-utils/ipcs.c:299
msgid "------ Shared Memory Segment Creators/Owners --------\n"
msgstr ""
-#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:300 sys-utils/ipcs.c:417 sys-utils/ipcs.c:516
#, c-format
msgid "%-10s %-10s %-10s %-10s %-10s %-10s\n"
msgstr ""
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:308 sys-utils/ipcs.c:315
-#: sys-utils/ipcs.c:321 sys-utils/ipcs.c:425
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:307 sys-utils/ipcs.c:314
+#: sys-utils/ipcs.c:320 sys-utils/ipcs.c:424
msgid "shmid"
msgstr ""
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:321 sys-utils/ipcs.c:419
-#: sys-utils/ipcs.c:434 sys-utils/ipcs.c:519 sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:320 sys-utils/ipcs.c:418
+#: sys-utils/ipcs.c:433 sys-utils/ipcs.c:517 sys-utils/ipcs.c:535
msgid "perms"
msgstr ""
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:517
msgid "cuid"
msgstr ""
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:517
msgid "cgid"
msgstr ""
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:517
msgid "uid"
msgstr ""
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:517
msgid "gid"
msgstr ""
-#: sys-utils/ipcs.c:306
+#: sys-utils/ipcs.c:305
msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
msgstr ""
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:306
#, c-format
msgid "%-10s %-10s %-20s %-20s %-20s\n"
msgstr ""
-#: sys-utils/ipcs.c:308 sys-utils/ipcs.c:315 sys-utils/ipcs.c:321
-#: sys-utils/ipcs.c:425 sys-utils/ipcs.c:434 sys-utils/ipcs.c:525
-#: sys-utils/ipcs.c:531 sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:314 sys-utils/ipcs.c:320
+#: sys-utils/ipcs.c:424 sys-utils/ipcs.c:433 sys-utils/ipcs.c:523
+#: sys-utils/ipcs.c:529 sys-utils/ipcs.c:535
msgid "owner"
msgstr ""
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:307
msgid "attached"
msgstr ""
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:307
msgid "detached"
msgstr ""
-#: sys-utils/ipcs.c:309
+#: sys-utils/ipcs.c:308
msgid "changed"
msgstr ""
-#: sys-utils/ipcs.c:313
+#: sys-utils/ipcs.c:312
msgid "------ Shared Memory Creator/Last-op --------\n"
msgstr ""
-#: sys-utils/ipcs.c:314 sys-utils/ipcs.c:530
+#: sys-utils/ipcs.c:313 sys-utils/ipcs.c:528
#, c-format
msgid "%-10s %-10s %-10s %-10s\n"
msgstr ""
-#: sys-utils/ipcs.c:315
+#: sys-utils/ipcs.c:314
msgid "cpid"
msgstr ""
-#: sys-utils/ipcs.c:315
+#: sys-utils/ipcs.c:314
msgid "lpid"
msgstr ""
-#: sys-utils/ipcs.c:319
+#: sys-utils/ipcs.c:318
msgid "------ Shared Memory Segments --------\n"
msgstr ""
-#: sys-utils/ipcs.c:320
+#: sys-utils/ipcs.c:319
#, c-format
msgid "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n"
msgstr ""
-#: sys-utils/ipcs.c:321 sys-utils/ipcs.c:434 sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:320 sys-utils/ipcs.c:433 sys-utils/ipcs.c:535
msgid "key"
msgstr ""
-#: sys-utils/ipcs.c:321
+#: sys-utils/ipcs.c:320
msgid "bytes"
msgstr ""
-#: sys-utils/ipcs.c:322
+#: sys-utils/ipcs.c:321
msgid "nattch"
msgstr ""
-#: sys-utils/ipcs.c:322 sys-utils/ipcs.c:435
+#: sys-utils/ipcs.c:321
msgid "status"
msgstr ""
-#: sys-utils/ipcs.c:343 sys-utils/ipcs.c:345 sys-utils/ipcs.c:347
-#: sys-utils/ipcs.c:456 sys-utils/ipcs.c:458 sys-utils/ipcs.c:558
-#: sys-utils/ipcs.c:560 sys-utils/ipcs.c:562 sys-utils/ipcs.c:615
-#: sys-utils/ipcs.c:617 sys-utils/ipcs.c:646 sys-utils/ipcs.c:648
-#: sys-utils/ipcs.c:650 sys-utils/ipcs.c:674
+#: sys-utils/ipcs.c:342 sys-utils/ipcs.c:344 sys-utils/ipcs.c:346
+#: sys-utils/ipcs.c:455 sys-utils/ipcs.c:457 sys-utils/ipcs.c:556
+#: sys-utils/ipcs.c:558 sys-utils/ipcs.c:560 sys-utils/ipcs.c:613
+#: sys-utils/ipcs.c:615 sys-utils/ipcs.c:644 sys-utils/ipcs.c:646
+#: sys-utils/ipcs.c:648 sys-utils/ipcs.c:672
msgid "Not set"
msgstr ""
-#: sys-utils/ipcs.c:372
+#: sys-utils/ipcs.c:371
msgid "dest"
msgstr ""
-#: sys-utils/ipcs.c:373
+#: sys-utils/ipcs.c:372
msgid "locked"
msgstr ""
-#: sys-utils/ipcs.c:393
+#: sys-utils/ipcs.c:392
msgid "kernel not configured for semaphores\n"
msgstr ""
-#: sys-utils/ipcs.c:399
+#: sys-utils/ipcs.c:398
msgid "------ Semaphore Limits --------\n"
msgstr ""
-#: sys-utils/ipcs.c:403
+#: sys-utils/ipcs.c:402
#, c-format
msgid "max number of arrays = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:404
+#: sys-utils/ipcs.c:403
#, c-format
msgid "max semaphores per array = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:405
+#: sys-utils/ipcs.c:404
#, c-format
msgid "max semaphores system wide = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:405
#, c-format
msgid "max ops per semop call = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:407
+#: sys-utils/ipcs.c:406
#, c-format
msgid "semaphore max value = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:411
+#: sys-utils/ipcs.c:410
msgid "------ Semaphore Status --------\n"
msgstr ""
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:411
#, c-format
msgid "used arrays = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:413
+#: sys-utils/ipcs.c:412
#, c-format
msgid "allocated semaphores = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:417
+#: sys-utils/ipcs.c:416
msgid "------ Semaphore Arrays Creators/Owners --------\n"
msgstr ""
-#: sys-utils/ipcs.c:419 sys-utils/ipcs.c:434
+#: sys-utils/ipcs.c:418 sys-utils/ipcs.c:433
msgid "semid"
msgstr ""
-#: sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:422
msgid "------ Shared Memory Operation/Change Times --------\n"
msgstr ""
-#: sys-utils/ipcs.c:424
+#: sys-utils/ipcs.c:423
#, c-format
msgid "%-8s %-10s %-26.24s %-26.24s\n"
msgstr ""
-#: sys-utils/ipcs.c:425
+#: sys-utils/ipcs.c:424
msgid "last-op"
msgstr ""
-#: sys-utils/ipcs.c:425
+#: sys-utils/ipcs.c:424
msgid "last-changed"
msgstr ""
-#: sys-utils/ipcs.c:432
+#: sys-utils/ipcs.c:431
msgid "------ Semaphore Arrays --------\n"
msgstr ""
-#: sys-utils/ipcs.c:433
+#: sys-utils/ipcs.c:432 sys-utils/ipcs.c:675
#, c-format
-msgid "%-10s %-10s %-10s %-10s %-10s %-12s\n"
+msgid "%-10s %-10s %-10s %-10s %-10s\n"
msgstr ""
-#: sys-utils/ipcs.c:435
+#: sys-utils/ipcs.c:434
msgid "nsems"
msgstr ""
-#: sys-utils/ipcs.c:495
+#: sys-utils/ipcs.c:493
msgid "kernel not configured for message queues\n"
msgstr ""
-#: sys-utils/ipcs.c:503
+#: sys-utils/ipcs.c:501
msgid "------ Messages: Limits --------\n"
msgstr ""
-#: sys-utils/ipcs.c:504
+#: sys-utils/ipcs.c:502
#, c-format
msgid "max queues system wide = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:503
#, c-format
msgid "max size of message (bytes) = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:504
#, c-format
msgid "default max size of queue (bytes) = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:508
msgid "------ Messages: Status --------\n"
msgstr ""
-#: sys-utils/ipcs.c:511
+#: sys-utils/ipcs.c:509
#, c-format
msgid "allocated queues = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:510
#, c-format
msgid "used headers = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:513
+#: sys-utils/ipcs.c:511
#, c-format
msgid "used space = %d bytes\n"
msgstr ""
-#: sys-utils/ipcs.c:517
+#: sys-utils/ipcs.c:515
msgid "------ Message Queues: Creators/Owners --------\n"
msgstr ""
-#: sys-utils/ipcs.c:519 sys-utils/ipcs.c:525 sys-utils/ipcs.c:531
-#: sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:517 sys-utils/ipcs.c:523 sys-utils/ipcs.c:529
+#: sys-utils/ipcs.c:535
msgid "msqid"
msgstr ""
-#: sys-utils/ipcs.c:523
+#: sys-utils/ipcs.c:521
msgid "------ Message Queues Send/Recv/Change Times --------\n"
msgstr ""
-#: sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:522
#, c-format
msgid "%-8s %-10s %-20s %-20s %-20s\n"
msgstr ""
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:523
msgid "send"
msgstr ""
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:523
msgid "recv"
msgstr ""
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:523
msgid "change"
msgstr ""
-#: sys-utils/ipcs.c:529
+#: sys-utils/ipcs.c:527
msgid "------ Message Queues PIDs --------\n"
msgstr ""
-#: sys-utils/ipcs.c:531
+#: sys-utils/ipcs.c:529
msgid "lspid"
msgstr ""
-#: sys-utils/ipcs.c:531
+#: sys-utils/ipcs.c:529
msgid "lrpid"
msgstr ""
-#: sys-utils/ipcs.c:535
+#: sys-utils/ipcs.c:533
msgid "------ Message Queues --------\n"
msgstr ""
-#: sys-utils/ipcs.c:536
+#: sys-utils/ipcs.c:534
#, c-format
msgid "%-10s %-10s %-10s %-10s %-12s %-12s\n"
msgstr ""
-#: sys-utils/ipcs.c:538
+#: sys-utils/ipcs.c:536
msgid "used-bytes"
msgstr ""
-#: sys-utils/ipcs.c:538
+#: sys-utils/ipcs.c:536
msgid "messages"
msgstr ""
-#: sys-utils/ipcs.c:606
+#: sys-utils/ipcs.c:604
#, c-format
msgid ""
"\n"
"Shared memory Segment shmid=%d\n"
msgstr ""
-#: sys-utils/ipcs.c:607
+#: sys-utils/ipcs.c:605
#, c-format
msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
msgstr ""
-#: sys-utils/ipcs.c:609
+#: sys-utils/ipcs.c:607
#, c-format
msgid "mode=%#o\taccess_perms=%#o\n"
msgstr ""
-#: sys-utils/ipcs.c:611
+#: sys-utils/ipcs.c:609
#, c-format
msgid "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n"
msgstr ""
-#: sys-utils/ipcs.c:614
+#: sys-utils/ipcs.c:612
#, c-format
msgid "att_time=%-26.24s\n"
msgstr ""
-#: sys-utils/ipcs.c:616
+#: sys-utils/ipcs.c:614
#, c-format
msgid "det_time=%-26.24s\n"
msgstr ""
-#: sys-utils/ipcs.c:618 sys-utils/ipcs.c:649
+#: sys-utils/ipcs.c:616 sys-utils/ipcs.c:647
#, c-format
msgid "change_time=%-26.24s\n"
msgstr ""
-#: sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:631
#, c-format
msgid ""
"\n"
"Message Queue msqid=%d\n"
msgstr ""
-#: sys-utils/ipcs.c:634
+#: sys-utils/ipcs.c:632
#, c-format
msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
msgstr ""
-#: sys-utils/ipcs.c:636
+#: sys-utils/ipcs.c:634
#, c-format
msgid "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
msgstr ""
-#: sys-utils/ipcs.c:645
+#: sys-utils/ipcs.c:643
#, c-format
msgid "send_time=%-26.24s\n"
msgstr ""
-#: sys-utils/ipcs.c:647
+#: sys-utils/ipcs.c:645
#, c-format
msgid "rcv_time=%-26.24s\n"
msgstr ""
-#: sys-utils/ipcs.c:667
+#: sys-utils/ipcs.c:665
#, c-format
msgid ""
"\n"
"Semaphore Array semid=%d\n"
msgstr ""
-#: sys-utils/ipcs.c:668
+#: sys-utils/ipcs.c:666
#, c-format
msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
msgstr ""
-#: sys-utils/ipcs.c:670
+#: sys-utils/ipcs.c:668
#, c-format
msgid "mode=%#o, access_perms=%#o\n"
msgstr ""
-#: sys-utils/ipcs.c:672
+#: sys-utils/ipcs.c:670
#, c-format
msgid "nsems = %ld\n"
msgstr ""
-#: sys-utils/ipcs.c:673
+#: sys-utils/ipcs.c:671
#, c-format
msgid "otime = %-26.24s\n"
msgstr ""
-#: sys-utils/ipcs.c:675
+#: sys-utils/ipcs.c:673
#, c-format
msgid "ctime = %-26.24s\n"
msgstr ""
-#: sys-utils/ipcs.c:677
-#, c-format
-msgid "%-10s %-10s %-10s %-10s %-10s\n"
-msgstr ""
-
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "semnum"
msgstr ""
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "value"
msgstr ""
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "ncount"
msgstr ""
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "zcount"
msgstr ""
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "pid"
msgstr ""
@@ -8878,11 +9161,11 @@ msgstr ""
msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
msgstr ""
-#: text-utils/column.c:298
+#: text-utils/column.c:297
msgid "line too long"
msgstr ""
-#: text-utils/column.c:375
+#: text-utils/column.c:374
msgid "usage: column [-tx] [-c columns] [file ...]\n"
msgstr ""
@@ -8963,65 +9246,65 @@ msgstr ""
msgid "Can't open help file"
msgstr ""
-#: text-utils/more.c:1442 text-utils/more.c:1446
+#: text-utils/more.c:1442 text-utils/more.c:1447
msgid "[Press 'h' for instructions.]"
msgstr ""
-#: text-utils/more.c:1480
+#: text-utils/more.c:1481
#, c-format
msgid "\"%s\" line %d"
msgstr ""
-#: text-utils/more.c:1482
+#: text-utils/more.c:1483
#, c-format
msgid "[Not a file] line %d"
msgstr ""
-#: text-utils/more.c:1566
+#: text-utils/more.c:1567
msgid " Overflow\n"
msgstr ""
-#: text-utils/more.c:1613
+#: text-utils/more.c:1614
msgid "...skipping\n"
msgstr ""
-#: text-utils/more.c:1643
+#: text-utils/more.c:1644
msgid "Regular expression botch"
msgstr ""
-#: text-utils/more.c:1655
+#: text-utils/more.c:1656
msgid ""
"\n"
"Pattern not found\n"
msgstr ""
-#: text-utils/more.c:1658
+#: text-utils/more.c:1659 text-utils/pg.c:1134 text-utils/pg.c:1285
msgid "Pattern not found"
msgstr ""
-#: text-utils/more.c:1719
+#: text-utils/more.c:1720
msgid "can't fork\n"
msgstr ""
-#: text-utils/more.c:1758
+#: text-utils/more.c:1759
msgid ""
"\n"
"...Skipping "
msgstr ""
-#: text-utils/more.c:1763
+#: text-utils/more.c:1764
msgid "...Skipping to file "
msgstr ""
-#: text-utils/more.c:1765
+#: text-utils/more.c:1766
msgid "...Skipping back to file "
msgstr ""
-#: text-utils/more.c:2046
+#: text-utils/more.c:2047
msgid "Line too long"
msgstr ""
-#: text-utils/more.c:2089
+#: text-utils/more.c:2090
msgid "No previous command to substitute for"
msgstr ""
@@ -9071,6 +9354,97 @@ msgstr ""
msgid "hexdump: bad conversion character %%%s.\n"
msgstr ""
+#: text-utils/pg.c:246
+#, c-format
+msgid ""
+"%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
+msgstr ""
+
+#: text-utils/pg.c:255
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- %s\n"
+msgstr "võti `%s' vajab argumenti\n"
+
+#: text-utils/pg.c:263
+#, fuzzy, c-format
+msgid "%s: illegal option -- %s\n"
+msgstr "%s: vigane võti (%s)\n"
+
+#: text-utils/pg.c:380
+msgid "...skipping forward\n"
+msgstr ""
+
+#: text-utils/pg.c:382
+msgid "...skipping backward\n"
+msgstr ""
+
+#: text-utils/pg.c:404
+msgid "No next file"
+msgstr ""
+
+#: text-utils/pg.c:408
+#, fuzzy
+msgid "No previous file"
+msgstr "Ühtegi partitsiooni pole defineeritud\n"
+
+#: text-utils/pg.c:938
+#, fuzzy, c-format
+msgid "%s: Read error from %s file\n"
+msgstr "%s: lugemise viga failis %s\n"
+
+#.
+#. * Most likely '\0' in input.
+#.
+#: text-utils/pg.c:944
+#, c-format
+msgid "%s: Unexpected EOF in %s file\n"
+msgstr ""
+
+#: text-utils/pg.c:947
+#, fuzzy, c-format
+msgid "%s: Unknown error in %s file\n"
+msgstr "%s: seekimise viga failis %s\n"
+
+#: text-utils/pg.c:1042
+#, fuzzy, c-format
+msgid "%s: Cannot create tempfile\n"
+msgstr "%s: ei suuda lugeda ajutist faili\n"
+
+#: text-utils/pg.c:1051 text-utils/pg.c:1226
+#, fuzzy
+msgid "RE error: "
+msgstr "positsioneerimise viga"
+
+#: text-utils/pg.c:1208
+msgid "(EOF)"
+msgstr ""
+
+#: text-utils/pg.c:1234
+msgid "No remembered search string"
+msgstr ""
+
+#: text-utils/pg.c:1317
+#, fuzzy
+msgid "Cannot open "
+msgstr "Ei suuda avada seadmefaili %s\n"
+
+#: text-utils/pg.c:1365
+msgid "saved"
+msgstr ""
+
+#: text-utils/pg.c:1472
+msgid ": !command not allowed in rflag mode.\n"
+msgstr ""
+
+#: text-utils/pg.c:1504
+#, fuzzy
+msgid "fork() failed, try again later\n"
+msgstr "Parooli EI muudetud - proovige hiljem uuesti\n"
+
+#: text-utils/pg.c:1709
+msgid "(Next file: "
+msgstr ""
+
#: text-utils/rev.c:113
msgid "Unable to allocate bufferspace\n"
msgstr ""
@@ -9105,5 +9479,20 @@ msgstr ""
msgid "Out of memory when growing buffer.\n"
msgstr ""
-#~ msgid "DRDOS sekund. (FAT-12)"
-#~ msgstr "DRDOS sekund. (FAT-12)"
+#~ msgid "invalid number `%s'\n"
+#~ msgstr "vigane arv: %s\n"
+
+#~ msgid "number `%s' to `%s' out of range\n"
+#~ msgstr "arv `%s' võtmele `%s' on väljaspool lubatud vahemikku\n"
+
+#~ msgid "unrecognized option `%s'\n"
+#~ msgstr "tundmatu võti `%s'\n"
+
+#~ msgid "option `%s' requires an argument\n"
+#~ msgstr "võti `%s' vajab argumenti\n"
+
+#~ msgid "option `%s' doesn't allow an argument\n"
+#~ msgstr "võti `%s' ei luba argumente\n"
+
+#~ msgid "unrecognized option `-%c'\n"
+#~ msgstr "tundmatu võti `-%c'\n"
diff --git a/po/fr.po b/po/fr.po
index a3aefaf7c..8d234d390 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@
msgid ""
msgstr ""
"Project-Id-Version: util-linux 2.10o\n"
-"POT-Creation-Date: 2002-05-09 02:51+0200\n"
+"POT-Creation-Date: 2002-07-07 17:03+0200\n"
"PO-Revision-Date: 2000-09-07 19:17+0100\n"
"Last-Translator: Christophe Merlet (RedFox) <christophe@merlet.net>\n"
"Language-Team: Vincent Renardias <vincent@ldsol.com>\n"
@@ -64,9 +64,8 @@ msgid "reread partition table"
msgstr "relecture de la table de partition"
#: disk-utils/blockdev.c:98
-#, fuzzy
msgid "Usage:\n"
-msgstr "Usage :"
+msgstr "Usage :\n"
#: disk-utils/blockdev.c:100
#, c-format
@@ -74,13 +73,13 @@ msgid " %s --report [devices]\n"
msgstr ""
#: disk-utils/blockdev.c:101
-#, fuzzy, c-format
+#, c-format
msgid " %s [-v|-q] commands devices\n"
-msgstr "Usage : %s [-V] [-v|-q] commandes périphériques\n"
+msgstr " %s [-V] [-v|-q] commandes périphériques\n"
#: disk-utils/blockdev.c:102
msgid "Available commands:\n"
-msgstr "Commandes disponible :\n"
+msgstr "Commandes disponibles:\n"
#: disk-utils/blockdev.c:219
#, c-format
@@ -95,49 +94,48 @@ msgstr "%s nécessite un argument\n"
#: disk-utils/blockdev.c:278
#, c-format
msgid "%s succeeded.\n"
-msgstr ""
+msgstr "%s a réussi.\n"
#: disk-utils/blockdev.c:296 disk-utils/blockdev.c:321
-#, fuzzy, c-format
+#, c-format
msgid "%s: cannot open %s\n"
-msgstr "%s : impossible d'ouvrir %s : %s\n"
+msgstr "%s : impossible d'ouvrir %s\n"
#: disk-utils/blockdev.c:338
-#, fuzzy, c-format
+#, c-format
msgid "%s: ioctl error on %s\n"
-msgstr "Erreur d'écriture sur %s\n"
+msgstr ""
#: disk-utils/blockdev.c:345
msgid "RO RA SSZ BSZ StartSec Size Device\n"
msgstr ""
#: disk-utils/elvtune.c:46 disk-utils/setfdprm.c:100
-#, fuzzy
msgid "usage:\n"
-msgstr "Usage :"
+msgstr "Usage :\n"
-#: disk-utils/fdformat.c:35
+#: disk-utils/fdformat.c:31
msgid "Formatting ... "
msgstr "Formatage en cours ... "
-#: disk-utils/fdformat.c:53 disk-utils/fdformat.c:88
+#: disk-utils/fdformat.c:49 disk-utils/fdformat.c:84
msgid "done\n"
msgstr "terminé\n"
-#: disk-utils/fdformat.c:64
+#: disk-utils/fdformat.c:60
msgid "Verifying ... "
msgstr "Vérification en cours ... "
-#: disk-utils/fdformat.c:75
+#: disk-utils/fdformat.c:71
msgid "Read: "
msgstr "Lecture : "
-#: disk-utils/fdformat.c:77
+#: disk-utils/fdformat.c:73
#, c-format
msgid "Problem reading cylinder %d, expected %d, read %d\n"
msgstr "Problème lors de la lecture du cylindre %d, %d attendu, %d lu\n"
-#: disk-utils/fdformat.c:83
+#: disk-utils/fdformat.c:79
#, c-format
msgid ""
"bad data in cyl %d\n"
@@ -146,42 +144,148 @@ msgstr ""
"Mauvaises données au cylindre %d\n"
"Continuation..."
-#: disk-utils/fdformat.c:98
+#: disk-utils/fdformat.c:94
#, c-format
msgid "usage: %s [ -n ] device\n"
msgstr "Usage : %s [ -n ] périphérique\n"
-#: disk-utils/fdformat.c:120 disk-utils/fsck.minix.c:1291
+#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1291
#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:55
-#: disk-utils/mkfs.minix.c:644 disk-utils/mkswap.c:457
-#: disk-utils/setfdprm.c:128 misc-utils/cal.c:246 misc-utils/ddate.c:181
-#: misc-utils/kill.c:188 misc-utils/rename.c:79 misc-utils/script.c:132
+#: disk-utils/mkfs.cramfs.c:665 disk-utils/mkfs.minix.c:644
+#: disk-utils/mkswap.c:457 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1170
+#: misc-utils/cal.c:246 misc-utils/ddate.c:181 misc-utils/kill.c:188
+#: misc-utils/rename.c:79 misc-utils/script.c:132
#, c-format
msgid "%s from %s\n"
msgstr "%s de %s\n"
-#: disk-utils/fdformat.c:134
-#, c-format
-msgid "%s: not a floppy device\n"
+#: disk-utils/fdformat.c:130
+#, fuzzy, c-format
+msgid "%s: not a block device\n"
msgstr "%s : n'est pas un lecteur de disquettes.\n"
-#: disk-utils/fdformat.c:143
+#: disk-utils/fdformat.c:140
msgid "Could not determine current format type"
msgstr "Impossible de déterminer le type du format en cours."
-#: disk-utils/fdformat.c:144
+#: disk-utils/fdformat.c:141
#, c-format
msgid "%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n"
msgstr "%s-faces, %d pistes, %d sec/piste. Capacité totale %d Ko.\n"
-#: disk-utils/fdformat.c:145
+#: disk-utils/fdformat.c:142
msgid "Double"
msgstr "Double"
-#: disk-utils/fdformat.c:145
+#: disk-utils/fdformat.c:142
msgid "Single"
msgstr "Simple"
+#: disk-utils/fsck.cramfs.c:98
+#, c-format
+msgid ""
+"usage: %s [-hv] [-x dir] file\n"
+" -h print this help\n"
+" -x dir extract into dir\n"
+" -v be more verbose\n"
+" file file to test\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:191
+#, c-format
+msgid "%s: error %d while decompressing! %p(%d)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:243
+#, fuzzy, c-format
+msgid "%s: size error in symlink `%s'\n"
+msgstr "Erreur d'écriture sur %s\n"
+
+#: disk-utils/fsck.cramfs.c:258 disk-utils/fsck.cramfs.c:328
+#, c-format
+msgid " uncompressing block at %ld to %ld (%ld)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:287
+#, c-format
+msgid "%s: bogus mode on `%s' (%o)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:319
+#, fuzzy, c-format
+msgid " hole at %ld (%d)\n"
+msgstr "devrait être (%d, %d, %d)\n"
+
+#: disk-utils/fsck.cramfs.c:337
+#, c-format
+msgid "%s: Non-block (%ld) bytes\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:343
+#, c-format
+msgid "%s: Non-size (%ld vs %ld) bytes\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:392
+#, c-format
+msgid "%s: invalid cramfs--bad path length\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:472
+#, fuzzy, c-format
+msgid "%s: compiled without -x support\n"
+msgstr "%s : non compilé avec prise en charge minix v2.\n"
+
+#: disk-utils/fsck.cramfs.c:498
+#, c-format
+msgid "%s: warning--unable to determine filesystem size \n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:508
+#, fuzzy, c-format
+msgid "%s is not a block device or file\n"
+msgstr "%s : n'est pas un lecteur de disquettes.\n"
+
+#: disk-utils/fsck.cramfs.c:514 disk-utils/fsck.cramfs.c:549
+#, c-format
+msgid "%s: invalid cramfs--file length too short\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:541
+#, c-format
+msgid "%s: invalid cramfs--wrong magic\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:554
+#, c-format
+msgid "%s: warning--file length too long, padded image?\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:564
+#, c-format
+msgid "%s: invalid cramfs--crc error\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:570
+#, c-format
+msgid "%s: warning--old cramfs image, no CRC\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:592
+#, c-format
+msgid "%s: invalid cramfs--bad superblock\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:608
+#, c-format
+msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:616
+#, c-format
+msgid "%s: invalid cramfs--invalid file data offset\n"
+msgstr ""
+
#: disk-utils/fsck.minix.c:200
#, c-format
msgid "Usage: %s [-larvsmf] /dev/name\n"
@@ -201,28 +305,28 @@ msgid "check aborted.\n"
msgstr "Vérification interrompue.\n"
#: disk-utils/fsck.minix.c:332 disk-utils/fsck.minix.c:356
-#, fuzzy, c-format
+#, c-format
msgid "Zone nr < FIRSTZONE in file `%s'."
-msgstr "Zone n° < FIRSTZONE dans fichier `"
+msgstr "Zone n° < FIRSTZONE dans fichier `%s'."
#: disk-utils/fsck.minix.c:336 disk-utils/fsck.minix.c:360
-#, fuzzy, c-format
+#, c-format
msgid "Zone nr >= ZONES in file `%s'."
-msgstr "Zone n° >= ZONES dans fichier `"
+msgstr "Zone n° >= ZONES dans fichier `%s'."
#: disk-utils/fsck.minix.c:341 disk-utils/fsck.minix.c:365
msgid "Remove block"
msgstr "Enlever le bloc"
#: disk-utils/fsck.minix.c:384
-#, fuzzy, c-format
+#, c-format
msgid "Read error: unable to seek to block in file '%s'\n"
-msgstr "Erreur de lecture : bloc impossible dans le fichier '"
+msgstr "Erreur de lecture : bloc impossible dans le fichier '%s'\n"
#: disk-utils/fsck.minix.c:390
-#, fuzzy, c-format
+#, c-format
msgid "Read error: bad block in file '%s'\n"
-msgstr "Erreur de lecture : mauvais bloc dans le fichier '"
+msgstr "Erreur de lecture : mauvais bloc dans le fichier '%s'\n"
#: disk-utils/fsck.minix.c:405
msgid ""
@@ -237,9 +341,9 @@ msgid "seek failed in write_block"
msgstr "La recherche dans write_block a échoué."
#: disk-utils/fsck.minix.c:414
-#, fuzzy, c-format
+#, c-format
msgid "Write error: bad block in file '%s'\n"
-msgstr "Erreur d'écriture : mauvais bloc dans le fichier '"
+msgstr "Erreur d'écriture : mauvais bloc dans le fichier '%s'\n"
#: disk-utils/fsck.minix.c:532
msgid "seek failed in write_super_block"
@@ -646,7 +750,7 @@ msgstr ""
msgid "not enough space, need at least %lu blocks"
msgstr ""
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2057
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2069
#, c-format
msgid "Device: %s\n"
msgstr "Périphérique : %s\n"
@@ -736,6 +840,130 @@ msgstr "%s : A court de mémoire !\n"
msgid "mkfs version %s (%s)\n"
msgstr "mkfs version %s (%s)\n"
+#: disk-utils/mkfs.cramfs.c:49
+#, c-format
+msgid ""
+"usage: %s [-h] [-v] [-e edition] [-i file] [-n name] dirname outfile\n"
+" -h print this help\n"
+" -v be verbose\n"
+" -E make all warnings errors (non-zero exit status)\n"
+" -e edition set edition number (part of fsid)\n"
+" -i file insert a file image into the filesystem (requires >= 2.4.0)\n"
+" -n name set name of cramfs filesystem\n"
+" -p pad by %d bytes for boot code\n"
+" -s sort directory entries (old option, ignored)\n"
+" -z make explicit holes (requires >= 2.3.39)\n"
+" dirname root of the filesystem to be compressed\n"
+" outfile output file\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:213
+#, c-format
+msgid ""
+"Very long (%u bytes) filename `%s' found.\n"
+" Please increase MAX_INPUT_NAMELEN in mkcramfs.c and recompile. Exiting.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:371
+msgid "filesystem too big. Exiting.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:422
+msgid ""
+"Exceeded MAXENTRIES. Raise this value in mkcramfs.c and recompile. "
+"Exiting.\n"
+msgstr ""
+
+#. (I don't think this can happen with zlib.)
+#: disk-utils/mkfs.cramfs.c:520
+#, c-format
+msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:537
+#, c-format
+msgid "%6.2f%% (%+d bytes)\t%s\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:705
+#, c-format
+msgid ""
+"warning: guestimate of required size (upper bound) is %LdMB, but maximum "
+"image size is %uMB. We might die prematurely.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:747
+#, fuzzy, c-format
+msgid "Including: %s\n"
+msgstr "id invalide : %s\n"
+
+#: disk-utils/mkfs.cramfs.c:753
+#, c-format
+msgid "Directory data: %d bytes\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:761
+#, c-format
+msgid "Everything: %d kilobytes\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:766
+#, fuzzy, c-format
+msgid "Super block: %d bytes\n"
+msgstr "Espace utilisé = %d octets\n"
+
+#: disk-utils/mkfs.cramfs.c:773
+#, c-format
+msgid "CRC: %x\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:778
+#, c-format
+msgid "not enough space allocated for ROM image (%Ld allocated, %d used)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:790
+#, c-format
+msgid "ROM image write failed (%d %d)\n"
+msgstr ""
+
+#. (These warnings used to come at the start, but they scroll off the
+#. screen too quickly.)
+#. (can't happen when reading from ext2fs)
+#. bytes, not chars: think UTF8.
+#: disk-utils/mkfs.cramfs.c:799
+#, fuzzy
+msgid "warning: filenames truncated to 255 bytes.\n"
+msgstr "Avertissement : nombre de i-noeuds trop grand.\n"
+
+#: disk-utils/mkfs.cramfs.c:802
+msgid "warning: files were skipped due to errors.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:805
+#, c-format
+msgid "warning: file sizes truncated to %luMB (minus 1 byte).\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:810
+#, c-format
+msgid ""
+"warning: uids truncated to %u bits. (This may be a security concern.)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:815
+#, c-format
+msgid ""
+"warning: gids truncated to %u bits. (This may be a security concern.)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:820
+#, c-format
+msgid ""
+"WARNING: device numbers truncated to %u bits. This almost certainly means\n"
+"that some device files will be wrong.\n"
+msgstr ""
+
#: disk-utils/mkfs.minix.c:181
#, c-format
msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
@@ -879,7 +1107,7 @@ msgid "too many bad pages"
msgstr "Trop de mauvaises pages"
#: disk-utils/mkswap.c:359 misc-utils/look.c:182 misc-utils/setterm.c:1130
-#: text-utils/more.c:2062 text-utils/more.c:2073
+#: text-utils/more.c:2063 text-utils/more.c:2074
msgid "Out of memory"
msgstr "A court de mémoire"
@@ -1337,7 +1565,7 @@ msgstr " Logique"
#. odd flag on end
#. type id
#. type name
-#: fdisk/cfdisk.c:1996 fdisk/fdisk.c:1306 fdisk/fdisk.c:1594
+#: fdisk/cfdisk.c:1996 fdisk/fdisk.c:1318 fdisk/fdisk.c:1606
#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:690 fdisk/sfdisk.c:581
msgid "Unknown"
msgstr "Inconnu"
@@ -1881,7 +2109,7 @@ msgstr ""
" de têtes et de secteurs par piste.\n"
"\n"
-#: fdisk/fdisk.c:194
+#: fdisk/fdisk.c:195
#, fuzzy
msgid ""
"Usage: fdisk [-b SSZ] [-u] DISK Change partition table\n"
@@ -1903,7 +2131,7 @@ msgstr ""
"-u: Affiche le Début et la Fin en unités de secteurs (au lieu de cylindres)\n"
"-b 2048 : (pour certains disques MO) Utilise des secteurs de 2048 octets\n"
-#: fdisk/fdisk.c:206
+#: fdisk/fdisk.c:207
msgid ""
"Usage: fdisk [-l] [-b SSZ] [-u] device\n"
"E.g.: fdisk /dev/hda (for the first IDE disk)\n"
@@ -1920,223 +2148,223 @@ msgstr ""
"RAID)\n"
" ...\n"
-#: fdisk/fdisk.c:215
+#: fdisk/fdisk.c:216
#, c-format
msgid "Unable to open %s\n"
msgstr "Impossible d'ouvrir %s\n"
-#: fdisk/fdisk.c:219
+#: fdisk/fdisk.c:220
#, c-format
msgid "Unable to read %s\n"
msgstr "Impossible de lire %s\n"
-#: fdisk/fdisk.c:223
+#: fdisk/fdisk.c:224
#, c-format
msgid "Unable to seek on %s\n"
msgstr "Impossible de rechercher %s\n"
-#: fdisk/fdisk.c:227
+#: fdisk/fdisk.c:228
#, c-format
msgid "Unable to write %s\n"
msgstr "Impossible d'écrire %s\n"
-#: fdisk/fdisk.c:231
+#: fdisk/fdisk.c:232
#, c-format
msgid "BLKGETSIZE ioctl failed on %s\n"
msgstr "Échec de BLKGETSIZE ioctl sur %s\n"
-#: fdisk/fdisk.c:235
+#: fdisk/fdisk.c:236
msgid "Unable to allocate any more memory\n"
msgstr "Impossible d'allouer plus de mémoire\n"
-#: fdisk/fdisk.c:238
+#: fdisk/fdisk.c:239
msgid "Fatal error\n"
msgstr "Erreur fatale\n"
-#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:359 fdisk/fdisk.c:366
-#: fdisk/fdisk.c:389 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:439
-#: fdisk/fdiskbsdlabel.c:124
+#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:360 fdisk/fdisk.c:367
+#: fdisk/fdisk.c:390 fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:440
+#: fdisk/fdiskbsdlabel.c:129
msgid "Command action"
msgstr "Action de commande"
-#: fdisk/fdisk.c:323
+#: fdisk/fdisk.c:324
msgid " a toggle a read only flag"
msgstr " a (Dés)active un indicateur en lecture seule"
#. sun
-#: fdisk/fdisk.c:324 fdisk/fdisk.c:368
+#: fdisk/fdisk.c:325 fdisk/fdisk.c:369
msgid " b edit bsd disklabel"
msgstr " b Edite le libellé de disque bsd"
-#: fdisk/fdisk.c:325
+#: fdisk/fdisk.c:326
msgid " c toggle the mountable flag"
msgstr " c (Dés)active l'indicateur Mountable"
#. sun
-#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:370
+#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:371
msgid " d delete a partition"
msgstr " d Supprime une partition"
-#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:371
+#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:372
msgid " l list known partition types"
msgstr " l Répertorie les types de partition connus"
#. sun
-#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:360 fdisk/fdisk.c:372
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
-#: fdisk/fdiskbsdlabel.c:129
+#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:361 fdisk/fdisk.c:373
+#: fdisk/fdisk.c:398 fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
+#: fdisk/fdiskbsdlabel.c:134
msgid " m print this menu"
msgstr " m Affiche ce menu"
-#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
+#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374
msgid " n add a new partition"
msgstr " n Ajoute une nouvelle partition"
-#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:361 fdisk/fdisk.c:374
+#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:362 fdisk/fdisk.c:375
msgid " o create a new empty DOS partition table"
msgstr " o Crée une nouvelle table de partition DOS vide"
-#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:375 fdisk/fdisk.c:398
-#: fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:376 fdisk/fdisk.c:399
+#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
msgid " p print the partition table"
msgstr " p Affiche la table de partition"
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:362 fdisk/fdisk.c:376
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
-#: fdisk/fdiskbsdlabel.c:132
+#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:363 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:450
+#: fdisk/fdiskbsdlabel.c:137
msgid " q quit without saving changes"
msgstr " q Quitte le programme sans enregistrer les modifications"
-#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:363 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:364 fdisk/fdisk.c:378
msgid " s create a new empty Sun disklabel"
msgstr " s Crée un nouveau libellé de disque Sun vide"
#. sun
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
msgid " t change a partition's system id"
msgstr " t Change l'ID système d'une partition"
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
msgid " u change display/entry units"
msgstr " u Change l'unité d'affichage/saisie"
-#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380 fdisk/fdisk.c:402
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:452
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381 fdisk/fdisk.c:403
+#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
msgid " v verify the partition table"
msgstr " v Vérifie la table de partition"
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381 fdisk/fdisk.c:403
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:382 fdisk/fdisk.c:404
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
msgid " w write table to disk and exit"
msgstr " w Ecrit la table sur le disque et quitte le programme"
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:383
msgid " x extra functionality (experts only)"
msgstr " x Fonctions supplémentaires (experts seulement)"
-#: fdisk/fdisk.c:342
+#: fdisk/fdisk.c:343
msgid " a select bootable partition"
msgstr " a Sélectionne la partition amorçable"
#. sgi flavour
-#: fdisk/fdisk.c:343
+#: fdisk/fdisk.c:344
msgid " b edit bootfile entry"
msgstr " b Edite l'entrée du fichier amorce"
#. sgi
-#: fdisk/fdisk.c:344
+#: fdisk/fdisk.c:345
msgid " c select sgi swap partition"
msgstr " c Sélectionne la partition de swap SGI"
-#: fdisk/fdisk.c:367
+#: fdisk/fdisk.c:368
msgid " a toggle a bootable flag"
msgstr " a (Dés)active un indicateur Bootable"
-#: fdisk/fdisk.c:369
+#: fdisk/fdisk.c:370
msgid " c toggle the dos compatibility flag"
msgstr " c (Dés)active l'indicateur de compatibilité DOS"
-#: fdisk/fdisk.c:390
+#: fdisk/fdisk.c:391
msgid " a change number of alternate cylinders"
msgstr " a Change le nombre de cylindres de remplacement"
#. sun
-#: fdisk/fdisk.c:391 fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:441
+#: fdisk/fdisk.c:392 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
msgid " c change number of cylinders"
msgstr " c Change le nombre de cylindres"
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:393 fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:443
msgid " d print the raw data in the partition table"
msgstr " d Affiche les données brutes de la table de partition"
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:394
msgid " e change number of extra sectors per cylinder"
msgstr " e Change le nombre de secteurs supplémentaires par cylindre"
#. sun
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:395 fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
msgid " h change number of heads"
msgstr " h Change le nombre de têtes"
-#: fdisk/fdisk.c:395
+#: fdisk/fdisk.c:396
msgid " i change interleave factor"
msgstr " i Change le facteur d'entrelacement"
#. sun
-#: fdisk/fdisk.c:396
+#: fdisk/fdisk.c:397
msgid " o change rotation speed (rpm)"
msgstr " o Change la vitesse de rotation (rpm)"
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:450
-#: fdisk/fdiskbsdlabel.c:133
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:451
+#: fdisk/fdiskbsdlabel.c:138
msgid " r return to main menu"
msgstr " r Revient au menu principal"
-#: fdisk/fdisk.c:401 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:452
msgid " s change number of sectors/track"
msgstr " s Change le nombre de secteurs/piste"
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:405
msgid " y change number of physical cylinders"
msgstr " y Change le nombre de cylindres physiques"
-#: fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:440
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:441
msgid " b move beginning of data in a partition"
msgstr " b Déplace le début des données d'une partition"
-#: fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:443
+#: fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:444
msgid " e list extended partitions"
msgstr " e Répertorie les partitions étendues"
#. !sun
-#: fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
#, fuzzy
msgid " g create an IRIX (SGI) partition table"
msgstr " g Crée une table de partition IRIX"
#. !sun
-#: fdisk/fdisk.c:444
+#: fdisk/fdisk.c:445
msgid " f fix partition order"
msgstr " f fixe l'ordre des partitions"
-#: fdisk/fdisk.c:561
+#: fdisk/fdisk.c:562
msgid "You must set"
msgstr "Vous devez définir les"
-#: fdisk/fdisk.c:575
+#: fdisk/fdisk.c:576
msgid "heads"
msgstr "têtes"
-#: fdisk/fdisk.c:577 fdisk/fdisk.c:1142 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:578 fdisk/fdisk.c:1154 fdisk/sfdisk.c:864
msgid "sectors"
msgstr "secteurs"
-#: fdisk/fdisk.c:579 fdisk/fdisk.c:1142 fdisk/fdiskbsdlabel.c:464
+#: fdisk/fdisk.c:580 fdisk/fdisk.c:1154 fdisk/fdiskbsdlabel.c:469
#: fdisk/sfdisk.c:864
msgid "cylinders"
msgstr "cylindres"
-#: fdisk/fdisk.c:583
+#: fdisk/fdisk.c:584
#, c-format
msgid ""
"%s%s.\n"
@@ -2145,11 +2373,11 @@ msgstr ""
"%s%s.\n"
"Vous pouvez le faire depuis le menu des fonctions supplémentaires.\n"
-#: fdisk/fdisk.c:584
+#: fdisk/fdisk.c:585
msgid " and "
msgstr " et "
-#: fdisk/fdisk.c:601
+#: fdisk/fdisk.c:602
#, c-format
msgid ""
"\n"
@@ -2161,29 +2389,29 @@ msgid ""
" (e.g., DOS FDISK, OS/2 FDISK)\n"
msgstr ""
-#: fdisk/fdisk.c:624
+#: fdisk/fdisk.c:625
msgid "Bad offset in primary extended partition\n"
msgstr "Mauvais décalage dans la partition primaire étendue\n"
-#: fdisk/fdisk.c:638
+#: fdisk/fdisk.c:639
#, c-format
msgid "Warning: deleting partitions after %d\n"
msgstr "Avertissement : suppression des partitions après %d\n"
-#: fdisk/fdisk.c:655
+#: fdisk/fdisk.c:656
#, c-format
msgid "Warning: extra link pointer in partition table %d\n"
msgstr ""
"Avertissement : pointeur de lien en trop dans la table de partition %d\n"
-#: fdisk/fdisk.c:663
+#: fdisk/fdisk.c:664
#, c-format
msgid "Warning: ignoring extra data in partition table %d\n"
msgstr ""
"Avertissement : va ignorer les données supplémentaires de la table de "
"partition %d\n"
-#: fdisk/fdisk.c:708
+#: fdisk/fdisk.c:709
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"
@@ -2197,16 +2425,22 @@ msgstr ""
"ne pourra être restauré.\n"
"\n"
-#: fdisk/fdisk.c:752
+#: fdisk/fdisk.c:753
#, c-format
msgid "Note: sector size is %d (not %d)\n"
msgstr "Remarque : la taille de secteur est %d (pas %d)\n"
-#: fdisk/fdisk.c:870
+#: fdisk/fdisk.c:883
msgid "You will not be able to write the partition table.\n"
msgstr "Vous ne pourrez pas écrire la table de partition.\n"
-#: fdisk/fdisk.c:903
+#: fdisk/fdisk.c:914
+msgid ""
+"This disk has both DOS and BSD magic.\n"
+"Give the 'b' command to go to BSD mode.\n"
+msgstr ""
+
+#: fdisk/fdisk.c:924
msgid ""
"Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
"disklabel\n"
@@ -2214,16 +2448,16 @@ msgstr ""
"Le périphérique ne contient ni une table de partition DOS valide, ni un "
"libellé de disque Sun, SGI ou OSF.\n"
-#: fdisk/fdisk.c:920
+#: fdisk/fdisk.c:942
msgid "Internal error\n"
msgstr "Erreur interne\n"
-#: fdisk/fdisk.c:942
+#: fdisk/fdisk.c:954
#, c-format
msgid "Ignoring extra extended partition %d\n"
msgstr "Va ignorer la partition étendue supplémentaire %d\n"
-#: fdisk/fdisk.c:954
+#: fdisk/fdisk.c:966
#, c-format
msgid ""
"Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2232,7 +2466,7 @@ msgstr ""
"Avertissement : l'indicateur invalide 0x%04x de la table de partition %d "
"sera corrigé par w(rite).\n"
-#: fdisk/fdisk.c:976
+#: fdisk/fdisk.c:988
msgid ""
"\n"
"got EOF thrice - exiting..\n"
@@ -2240,65 +2474,65 @@ msgstr ""
"\n"
"EOF obtenu à trois reprises. Fermeture en cours...\n"
-#: fdisk/fdisk.c:1015
+#: fdisk/fdisk.c:1027
msgid "Hex code (type L to list codes): "
msgstr "Code hexadécimal (tapez L pour afficher une liste des codes) : "
-#: fdisk/fdisk.c:1054
+#: fdisk/fdisk.c:1066
#, c-format
msgid "%s (%d-%d, default %d): "
msgstr "%s (%d-%d, %d par défaut) : "
-#: fdisk/fdisk.c:1110
+#: fdisk/fdisk.c:1122
#, c-format
msgid "Using default value %d\n"
msgstr "Utilisation de la valeur par défaut %d\n"
-#: fdisk/fdisk.c:1114
+#: fdisk/fdisk.c:1126
msgid "Value out of range.\n"
msgstr "Valeur hors plage.\n"
-#: fdisk/fdisk.c:1124
+#: fdisk/fdisk.c:1136
msgid "Partition number"
msgstr "Nombre de partitions"
-#: fdisk/fdisk.c:1133
+#: fdisk/fdisk.c:1145
#, c-format
msgid "Warning: partition %d has empty type\n"
msgstr "Avertissement : la partition %d a un type vide.\n"
-#: fdisk/fdisk.c:1140
+#: fdisk/fdisk.c:1152
msgid "cylinder"
msgstr "cylindre"
-#: fdisk/fdisk.c:1140
+#: fdisk/fdisk.c:1152
msgid "sector"
msgstr "secteur"
-#: fdisk/fdisk.c:1149
+#: fdisk/fdisk.c:1161
#, c-format
msgid "Changing display/entry units to %s\n"
msgstr "Remplacement des unités d'affichage/saisie par %s\n"
-#: fdisk/fdisk.c:1160
+#: fdisk/fdisk.c:1172
#, c-format
msgid "WARNING: Partition %d is an extended partition\n"
msgstr "AVERTISSEMENT : La partition %d est une partition étendue.\n"
-#: fdisk/fdisk.c:1171
+#: fdisk/fdisk.c:1183
msgid "DOS Compatibility flag is set\n"
msgstr "L'indicateur de compatibilité DOS est défini.\n"
-#: fdisk/fdisk.c:1175
+#: fdisk/fdisk.c:1187
msgid "DOS Compatibility flag is not set\n"
msgstr "L'indicateur de compatibilité DOS n'est pas défini.\n"
-#: fdisk/fdisk.c:1261
+#: fdisk/fdisk.c:1273
#, c-format
msgid "Partition %d does not exist yet!\n"
msgstr "La partition %d n'existe pas encore !\n"
-#: fdisk/fdisk.c:1266
+#: fdisk/fdisk.c:1278
msgid ""
"Type 0 means free space to many systems\n"
"(but not to Linux). Having partitions of\n"
@@ -2311,7 +2545,7 @@ msgstr ""
"type 0 n'est pas une bonne idée. Vous pouvez supprimer\n"
"une partition à l'aide de la commande `d'.\n"
-#: fdisk/fdisk.c:1275
+#: fdisk/fdisk.c:1287
msgid ""
"You cannot change a partition into an extended one or vice versa\n"
"Delete it first.\n"
@@ -2320,7 +2554,7 @@ msgstr ""
"inversement.\n"
"Supprimez-la d'abord.\n"
-#: fdisk/fdisk.c:1284
+#: fdisk/fdisk.c:1296
msgid ""
"Consider leaving partition 3 as Whole disk (5),\n"
"as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2330,7 +2564,7 @@ msgstr ""
"car SunOS/Solaris s'y attend et Linux aime également l'utiliser.\n"
"\n"
-#: fdisk/fdisk.c:1290
+#: fdisk/fdisk.c:1302
msgid ""
"Consider leaving partition 9 as volume header (0),\n"
"and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2340,53 +2574,53 @@ msgstr ""
"et la partition 11 en tant que volume entier (6) car IRIX s'y attend.\n"
"\n"
-#: fdisk/fdisk.c:1303
+#: fdisk/fdisk.c:1315
#, c-format
msgid "Changed system type of partition %d to %x (%s)\n"
msgstr "Le type de système de la partition %d a été remplacé par %x (%s).\n"
-#: fdisk/fdisk.c:1357
+#: fdisk/fdisk.c:1369
#, c-format
msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
msgstr ""
"La partition %d a des débuts physique/logique différents (non-Linux ?) :\n"
-#: fdisk/fdisk.c:1359 fdisk/fdisk.c:1367 fdisk/fdisk.c:1376 fdisk/fdisk.c:1385
+#: fdisk/fdisk.c:1371 fdisk/fdisk.c:1379 fdisk/fdisk.c:1388 fdisk/fdisk.c:1397
#, c-format
msgid " phys=(%d, %d, %d) "
msgstr " phys=(%d, %d, %d) "
-#: fdisk/fdisk.c:1360 fdisk/fdisk.c:1368
+#: fdisk/fdisk.c:1372 fdisk/fdisk.c:1380
#, c-format
msgid "logical=(%d, %d, %d)\n"
msgstr "logique=(%d, %d, %d)\n"
-#: fdisk/fdisk.c:1365
+#: fdisk/fdisk.c:1377
#, c-format
msgid "Partition %d has different physical/logical endings:\n"
msgstr "La partition %d a des fins physique/logique différentes :\n"
-#: fdisk/fdisk.c:1374
+#: fdisk/fdisk.c:1386
#, c-format
msgid "Partition %i does not start on cylinder boundary:\n"
msgstr "La partition %i ne commence pas à la limite du cylindre :\n"
-#: fdisk/fdisk.c:1377
+#: fdisk/fdisk.c:1389
#, c-format
msgid "should be (%d, %d, 1)\n"
msgstr "devrait être (%d, %d, 1)\n"
-#: fdisk/fdisk.c:1383
+#: fdisk/fdisk.c:1395
#, c-format
msgid "Partition %i does not end on cylinder boundary:\n"
msgstr "La partition %i ne se termine pas à la limite du cylindre :\n"
-#: fdisk/fdisk.c:1386
+#: fdisk/fdisk.c:1398
#, c-format
msgid "should be (%d, %d, %d)\n"
msgstr "devrait être (%d, %d, %d)\n"
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1405
#, c-format
msgid ""
"\n"
@@ -2399,7 +2633,7 @@ msgstr ""
"Unités = %s sur %d * %d octets\n"
"\n"
-#: fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1513
msgid ""
"Nothing to do. Ordering is correct already.\n"
"\n"
@@ -2407,16 +2641,16 @@ msgstr ""
"Rien à faire. L'ordre est déjà correct.\n"
"\n"
-#: fdisk/fdisk.c:1565
+#: fdisk/fdisk.c:1577
#, c-format
msgid "%*s Boot Start End Blocks Id System\n"
msgstr "%*s Amorce Début Fin Blocs Id Système\n"
-#: fdisk/fdisk.c:1566 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:675
+#: fdisk/fdisk.c:1578 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:675
msgid "Device"
msgstr "Périphérique"
-#: fdisk/fdisk.c:1603
+#: fdisk/fdisk.c:1615
msgid ""
"\n"
"Partition table entries are not in disk order\n"
@@ -2424,7 +2658,7 @@ msgstr ""
"\n"
"Les entrées de la table de partitions ne suivent pas l'ordre du disque.\n"
-#: fdisk/fdisk.c:1613
+#: fdisk/fdisk.c:1625
#, c-format
msgid ""
"\n"
@@ -2435,95 +2669,95 @@ msgstr ""
"Disque %s : %d têtes, %d secteurs, %d cylindres\n"
"\n"
-#: fdisk/fdisk.c:1615
+#: fdisk/fdisk.c:1627
msgid "Nr AF Hd Sec Cyl Hd Sec Cyl Start Size ID\n"
msgstr "N° DA Tt Sec Cyl Tt Sec Cyl Début Taille ID\n"
-#: fdisk/fdisk.c:1659
+#: fdisk/fdisk.c:1671
#, c-format
msgid "Warning: partition %d contains sector 0\n"
msgstr "Avertissement : la partition %d contient un secteur 0.\n"
-#: fdisk/fdisk.c:1662
+#: fdisk/fdisk.c:1674
#, c-format
msgid "Partition %d: head %d greater than maximum %d\n"
msgstr "Partition %d : tête %d supérieure à la valeur maximum %d\n"
-#: fdisk/fdisk.c:1665
+#: fdisk/fdisk.c:1677
#, c-format
msgid "Partition %d: sector %d greater than maximum %d\n"
msgstr "Partition %d : secteur %d supérieur à la valeur maximum %d\n"
-#: fdisk/fdisk.c:1668
+#: fdisk/fdisk.c:1680
#, c-format
msgid "Partitions %d: cylinder %d greater than maximum %d\n"
msgstr "Partition %d : cylindre %d supérieur à la valeur maximum %d.\n"
-#: fdisk/fdisk.c:1672
+#: fdisk/fdisk.c:1684
#, c-format
msgid "Partition %d: previous sectors %d disagrees with total %d\n"
msgstr ""
"Partition %d : secteurs %d précédents ne correspondent pas au total %d.\n"
-#: fdisk/fdisk.c:1704
+#: fdisk/fdisk.c:1716
#, c-format
msgid "Warning: bad start-of-data in partition %d\n"
msgstr "Avertissement : mauvaises données de début dans la partition %d.\n"
-#: fdisk/fdisk.c:1712
+#: fdisk/fdisk.c:1724
#, c-format
msgid "Warning: partition %d overlaps partition %d.\n"
msgstr "Avertissement : la partition %d chevauche la partition %d.\n"
-#: fdisk/fdisk.c:1732
+#: fdisk/fdisk.c:1744
#, c-format
msgid "Warning: partition %d is empty\n"
msgstr "Avertissement : la partition %d est vide.\n"
-#: fdisk/fdisk.c:1737
+#: fdisk/fdisk.c:1749
#, c-format
msgid "Logical partition %d not entirely in partition %d\n"
msgstr "La partition logique %d n'est pas complètement dans la partition %d.\n"
-#: fdisk/fdisk.c:1743
+#: fdisk/fdisk.c:1755
#, c-format
msgid "Total allocated sectors %d greater than the maximum %d\n"
msgstr ""
"Le total des secteurs alloués %d est supérieur à la valeur maximum %d.\n"
-#: fdisk/fdisk.c:1746
+#: fdisk/fdisk.c:1758
#, c-format
msgid "%d unallocated sectors\n"
msgstr "%d secteurs non alloués\n"
-#: fdisk/fdisk.c:1759 fdisk/fdisksgilabel.c:661 fdisk/fdisksunlabel.c:505
+#: fdisk/fdisk.c:1771 fdisk/fdisksgilabel.c:661 fdisk/fdisksunlabel.c:505
#, c-format
msgid "Partition %d is already defined. Delete it before re-adding it.\n"
msgstr ""
"La partition %d est déjà définie. Supprimez-la avant de l'ajouter de "
"nouveau.\n"
-#: fdisk/fdisk.c:1780 fdisk/fdiskbsdlabel.c:279 fdisk/fdisksgilabel.c:683
+#: fdisk/fdisk.c:1792 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:683
#: fdisk/fdisksunlabel.c:520
#, c-format
msgid "First %s"
msgstr "Premier %s"
-#: fdisk/fdisk.c:1795 fdisk/fdisksunlabel.c:561
+#: fdisk/fdisk.c:1807 fdisk/fdisksunlabel.c:561
#, c-format
msgid "Sector %d is already allocated\n"
msgstr "Le secteur %d est déjà alloué.\n"
-#: fdisk/fdisk.c:1831
+#: fdisk/fdisk.c:1843
msgid "No free sectors available\n"
msgstr "Aucun secteur libre disponible.\n"
-#: fdisk/fdisk.c:1840 fdisk/fdiskbsdlabel.c:286 fdisk/fdisksunlabel.c:572
+#: fdisk/fdisk.c:1852 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:572
#, c-format
msgid "Last %s or +size or +sizeM or +sizeK"
msgstr "Dernier %s ou +size ou +sizeM ou +sizeK"
-#: fdisk/fdisk.c:1905
+#: fdisk/fdisk.c:1917
msgid ""
"\tSorry - this fdisk cannot handle AIX disk labels.\n"
"\tIf you want to add DOS-type partitions, create\n"
@@ -2531,17 +2765,17 @@ msgid ""
"\tWARNING: This will destroy the present disk contents.\n"
msgstr ""
-#: fdisk/fdisk.c:1914 fdisk/fdiskbsdlabel.c:613
+#: fdisk/fdisk.c:1926 fdisk/fdiskbsdlabel.c:617
msgid "The maximum number of partitions has been created\n"
msgstr "Le nombre maximum de partitions a déjà été créé.\n"
-#: fdisk/fdisk.c:1924
+#: fdisk/fdisk.c:1936
msgid "You must delete some partition and add an extended partition first\n"
msgstr ""
"Vous devez d'abord supprimer une partition et ajouter une partition "
"étendue.\n"
-#: fdisk/fdisk.c:1929
+#: fdisk/fdisk.c:1941
#, c-format
msgid ""
"Command action\n"
@@ -2552,20 +2786,20 @@ msgstr ""
" %s\n"
" p Partition primaire (1-4)\n"
-#: fdisk/fdisk.c:1931
+#: fdisk/fdisk.c:1943
msgid "l logical (5 or over)"
msgstr "l Logique (5 ou plus)"
-#: fdisk/fdisk.c:1931
+#: fdisk/fdisk.c:1943
msgid "e extended"
msgstr "e Etendue"
-#: fdisk/fdisk.c:1948
+#: fdisk/fdisk.c:1960
#, c-format
msgid "Invalid partition number for type `%c'\n"
msgstr "Nombre de partitions non valide pour le type `%c'.\n"
-#: fdisk/fdisk.c:1984
+#: fdisk/fdisk.c:1996
msgid ""
"The partition table has been altered!\n"
"\n"
@@ -2573,11 +2807,11 @@ msgstr ""
"La table de partition a été modifiée !\n"
"\n"
-#: fdisk/fdisk.c:1993
+#: fdisk/fdisk.c:2005
msgid "Calling ioctl() to re-read partition table.\n"
msgstr "Appel de ioctl() pour relire la table de partition.\n"
-#: fdisk/fdisk.c:2009
+#: fdisk/fdisk.c:2021
#, c-format
msgid ""
"\n"
@@ -2586,7 +2820,7 @@ msgid ""
"The new table will be used at the next reboot.\n"
msgstr ""
-#: fdisk/fdisk.c:2019
+#: fdisk/fdisk.c:2031
msgid ""
"\n"
"WARNING: If you have created or modified any DOS 6.x\n"
@@ -2598,67 +2832,67 @@ msgstr ""
"une partition DOS 6.x, reportez-vous au manuel de fdisk\n"
"pour plus d'informations.\n"
-#: fdisk/fdisk.c:2026
+#: fdisk/fdisk.c:2038
msgid "Syncing disks.\n"
msgstr "Synchronisation des disques.\n"
-#: fdisk/fdisk.c:2073
+#: fdisk/fdisk.c:2085
#, c-format
msgid "Partition %d has no data area\n"
msgstr "La partition %d ne contient pas de zone de données.\n"
-#: fdisk/fdisk.c:2078
+#: fdisk/fdisk.c:2090
msgid "New beginning of data"
msgstr "Nouveau début des données"
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2106
msgid "Expert command (m for help): "
msgstr "Commande Expert (m pour aide) :"
-#: fdisk/fdisk.c:2107
+#: fdisk/fdisk.c:2119
msgid "Number of cylinders"
msgstr "Nombre de cylindres"
-#: fdisk/fdisk.c:2134
+#: fdisk/fdisk.c:2146
msgid "Number of heads"
msgstr "Nombre de têtes"
-#: fdisk/fdisk.c:2159
+#: fdisk/fdisk.c:2171
msgid "Number of sectors"
msgstr "Nombre de secteurs"
-#: fdisk/fdisk.c:2162
+#: fdisk/fdisk.c:2174
msgid "Warning: setting sector offset for DOS compatiblity\n"
msgstr ""
"Avertissement : définition du décalage des secteurs pour la compatibilité "
"DOS\n"
-#: fdisk/fdisk.c:2237
+#: fdisk/fdisk.c:2249
#, c-format
msgid "Disk %s doesn't contain a valid partition table\n"
msgstr "Le disque %s ne contient pas de table de partition valide.\n"
-#: fdisk/fdisk.c:2251
+#: fdisk/fdisk.c:2263
#, c-format
msgid "Cannot open %s\n"
msgstr "Impossible d'ouvrir %s\n"
-#: fdisk/fdisk.c:2267 fdisk/sfdisk.c:2363
+#: fdisk/fdisk.c:2279 fdisk/sfdisk.c:2363
#, c-format
msgid "cannot open %s\n"
msgstr "Impossible d'ouvrir %s\n"
-#: fdisk/fdisk.c:2289
+#: fdisk/fdisk.c:2301
#, c-format
msgid "%c: unknown command\n"
msgstr "%c : commande inconnue\n"
-#: fdisk/fdisk.c:2339
+#: fdisk/fdisk.c:2351
msgid "This kernel finds the sector size itself - -b option ignored\n"
msgstr ""
"Ce kernel trouve lui-même la taille de secteur, option - -b ignorée.\n"
-#: fdisk/fdisk.c:2342
+#: fdisk/fdisk.c:2355
msgid ""
"Warning: the -b (set sector size) option should be used with one specified "
"device\n"
@@ -2666,18 +2900,17 @@ msgstr ""
"Avertissement : l'option -b (définition de la taille de secteur) doit être "
"utilisée avec un périphériquedéfini.\n"
-#: fdisk/fdisk.c:2405
+#. OSF label, and no DOS label
+#: fdisk/fdisk.c:2414
#, c-format
-msgid ""
-"Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
-"To return to DOS partition table mode, use the 'r' command.\n"
+msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
msgstr ""
-#: fdisk/fdisk.c:2413
+#: fdisk/fdisk.c:2424
msgid "Command (m for help): "
msgstr "Commande (m pour aide) : "
-#: fdisk/fdisk.c:2429
+#: fdisk/fdisk.c:2440
#, c-format
msgid ""
"\n"
@@ -2686,15 +2919,15 @@ msgstr ""
"\n"
"Le fichier amorce en cours est : %s.\n"
-#: fdisk/fdisk.c:2431
+#: fdisk/fdisk.c:2442
msgid "Please enter the name of the new boot file: "
msgstr "Entrez le nom du nouveau fichier amorce : "
-#: fdisk/fdisk.c:2433
+#: fdisk/fdisk.c:2444
msgid "Boot file unchanged\n"
msgstr "Fichier amorce inchangé\n"
-#: fdisk/fdisk.c:2497
+#: fdisk/fdisk.c:2508
msgid ""
"\n"
"\tSorry, no experts menu for SGI partition tables available.\n"
@@ -2733,7 +2966,7 @@ msgstr ""
"\t de supprimer logiquement le disque de votre ordinateur AIX.\n"
"\t (Sinon, vous deviendrez un AIXpert)."
-#: fdisk/fdiskbsdlabel.c:117
+#: fdisk/fdiskbsdlabel.c:122
#, c-format
msgid ""
"\n"
@@ -2742,167 +2975,167 @@ msgstr ""
"\n"
"Libellé BSD pour le périphérique : %s\n"
-#: fdisk/fdiskbsdlabel.c:125
+#: fdisk/fdiskbsdlabel.c:130
msgid " d delete a BSD partition"
msgstr " d Efface une partition BSD"
-#: fdisk/fdiskbsdlabel.c:126
+#: fdisk/fdiskbsdlabel.c:131
msgid " e edit drive data"
msgstr " e Edite les données du disque"
-#: fdisk/fdiskbsdlabel.c:127
+#: fdisk/fdiskbsdlabel.c:132
msgid " i install bootstrap"
msgstr " i Installe une amorce"
-#: fdisk/fdiskbsdlabel.c:128
+#: fdisk/fdiskbsdlabel.c:133
msgid " l list known filesystem types"
msgstr " l Répertorie les types de système de fichiers connus"
-#: fdisk/fdiskbsdlabel.c:130
+#: fdisk/fdiskbsdlabel.c:135
msgid " n add a new BSD partition"
msgstr " n Ajoute une nouvelle partition BSD"
-#: fdisk/fdiskbsdlabel.c:131
+#: fdisk/fdiskbsdlabel.c:136
msgid " p print BSD partition table"
msgstr " p Affiche la table de partition BSD"
-#: fdisk/fdiskbsdlabel.c:134
+#: fdisk/fdiskbsdlabel.c:139
msgid " s show complete disklabel"
msgstr " s Affiche le libellé de disque complet"
-#: fdisk/fdiskbsdlabel.c:135
+#: fdisk/fdiskbsdlabel.c:140
msgid " t change a partition's filesystem id"
msgstr " t Change l'ID du système de fichiers d'une partition"
-#: fdisk/fdiskbsdlabel.c:136
+#: fdisk/fdiskbsdlabel.c:141
msgid " u change units (cylinders/sectors)"
msgstr " u Change d'unités (cylindres/secteurs)"
-#: fdisk/fdiskbsdlabel.c:137
+#: fdisk/fdiskbsdlabel.c:142
msgid " w write disklabel to disk"
msgstr " w Écrit le libellé de disque dans un disque"
-#: fdisk/fdiskbsdlabel.c:139
+#: fdisk/fdiskbsdlabel.c:144
msgid " x link BSD partition to non-BSD partition"
msgstr " x Lie la partition BSD à une partition non BSD"
-#: fdisk/fdiskbsdlabel.c:171
+#: fdisk/fdiskbsdlabel.c:176
#, c-format
msgid "Partition %s has invalid starting sector 0.\n"
msgstr "La partition %s a un secteur de début 0 non valide.\n"
-#: fdisk/fdiskbsdlabel.c:175
+#: fdisk/fdiskbsdlabel.c:180
#, c-format
msgid "Reading disklabel of %s at sector %d.\n"
msgstr "Lecture du libellé de disque de %s dans le secteur %d.\n"
-#: fdisk/fdiskbsdlabel.c:185
+#: fdisk/fdiskbsdlabel.c:190
#, c-format
msgid "There is no *BSD partition on %s.\n"
msgstr "Il n'y a aucune partition *BSD sur %s.\n"
-#: fdisk/fdiskbsdlabel.c:199
+#: fdisk/fdiskbsdlabel.c:204
msgid "BSD disklabel command (m for help): "
msgstr "Commande de libellé de disque BSD (m pour aide) : "
-#: fdisk/fdiskbsdlabel.c:313
+#: fdisk/fdiskbsdlabel.c:318
#, c-format
msgid "type: %s\n"
msgstr "type : %s\n"
-#: fdisk/fdiskbsdlabel.c:315
+#: fdisk/fdiskbsdlabel.c:320
#, c-format
msgid "type: %d\n"
msgstr "type : %d\n"
-#: fdisk/fdiskbsdlabel.c:316
+#: fdisk/fdiskbsdlabel.c:321
#, c-format
msgid "disk: %.*s\n"
msgstr "disque : %.*s\n"
-#: fdisk/fdiskbsdlabel.c:317
+#: fdisk/fdiskbsdlabel.c:322
#, c-format
msgid "label: %.*s\n"
msgstr "libellé : %.*s\n"
-#: fdisk/fdiskbsdlabel.c:318
+#: fdisk/fdiskbsdlabel.c:323
msgid "flags:"
msgstr "indicateurs :"
-#: fdisk/fdiskbsdlabel.c:320
+#: fdisk/fdiskbsdlabel.c:325
msgid " removable"
msgstr " supprimable"
-#: fdisk/fdiskbsdlabel.c:322
+#: fdisk/fdiskbsdlabel.c:327
msgid " ecc"
msgstr " ecc"
-#: fdisk/fdiskbsdlabel.c:324
+#: fdisk/fdiskbsdlabel.c:329
msgid " badsect"
msgstr " badsect"
#. On various machines the fields of *lp are short/int/long
#. In order to avoid problems, we cast them all to long.
-#: fdisk/fdiskbsdlabel.c:328
+#: fdisk/fdiskbsdlabel.c:333
#, c-format
msgid "bytes/sector: %ld\n"
msgstr "octets/secteur : %ld\n"
-#: fdisk/fdiskbsdlabel.c:329
+#: fdisk/fdiskbsdlabel.c:334
#, c-format
msgid "sectors/track: %ld\n"
msgstr "secteurs/piste : %ld\n"
-#: fdisk/fdiskbsdlabel.c:330
+#: fdisk/fdiskbsdlabel.c:335
#, c-format
msgid "tracks/cylinder: %ld\n"
msgstr "pistes/cylindre : %ld\n"
-#: fdisk/fdiskbsdlabel.c:331
+#: fdisk/fdiskbsdlabel.c:336
#, c-format
msgid "sectors/cylinder: %ld\n"
msgstr "secteurs/cylindre : %ld\n"
-#: fdisk/fdiskbsdlabel.c:332
+#: fdisk/fdiskbsdlabel.c:337
#, c-format
msgid "cylinders: %ld\n"
msgstr "cylindres : %ld\n"
-#: fdisk/fdiskbsdlabel.c:333
+#: fdisk/fdiskbsdlabel.c:338
#, c-format
msgid "rpm: %d\n"
msgstr "tpm : %d\n"
-#: fdisk/fdiskbsdlabel.c:334
+#: fdisk/fdiskbsdlabel.c:339
#, c-format
msgid "interleave: %d\n"
msgstr "interleave : %d\n"
-#: fdisk/fdiskbsdlabel.c:335
+#: fdisk/fdiskbsdlabel.c:340
#, c-format
msgid "trackskew: %d\n"
msgstr "trackskew : %d\n"
-#: fdisk/fdiskbsdlabel.c:336
+#: fdisk/fdiskbsdlabel.c:341
#, c-format
msgid "cylinderskew: %d\n"
msgstr "cylinderskew : %d\n"
-#: fdisk/fdiskbsdlabel.c:337
+#: fdisk/fdiskbsdlabel.c:342
#, c-format
msgid "headswitch: %ld\t\t# milliseconds\n"
msgstr "headswitch : %ld\t\t# millisecondes\n"
-#: fdisk/fdiskbsdlabel.c:339
+#: fdisk/fdiskbsdlabel.c:344
#, c-format
msgid "track-to-track seek: %ld\t# milliseconds\n"
msgstr "track-to-track seek : %ld\t# millisecondes\n"
-#: fdisk/fdiskbsdlabel.c:341
+#: fdisk/fdiskbsdlabel.c:346
msgid "drivedata: "
msgstr "drivedata : "
-#: fdisk/fdiskbsdlabel.c:350
+#: fdisk/fdiskbsdlabel.c:355
#, c-format
msgid ""
"\n"
@@ -2911,98 +3144,98 @@ msgstr ""
"\n"
"%d partitions :\n"
-#: fdisk/fdiskbsdlabel.c:351
+#: fdisk/fdiskbsdlabel.c:356
msgid "# start end size fstype [fsize bsize cpg]\n"
msgstr "N° début fin taille fstype [fsize bsize cpg]\n"
-#: fdisk/fdiskbsdlabel.c:400 fdisk/fdiskbsdlabel.c:403
+#: fdisk/fdiskbsdlabel.c:405 fdisk/fdiskbsdlabel.c:408
#, c-format
msgid "Writing disklabel to %s.\n"
msgstr "Ecriture du libellé de disque dans %s.\n"
-#: fdisk/fdiskbsdlabel.c:415 fdisk/fdiskbsdlabel.c:417
+#: fdisk/fdiskbsdlabel.c:420 fdisk/fdiskbsdlabel.c:422
#, c-format
msgid "%s contains no disklabel.\n"
msgstr "%s ne contient aucun libellé de disque.\n"
-#: fdisk/fdiskbsdlabel.c:422
+#: fdisk/fdiskbsdlabel.c:427
msgid "Do you want to create a disklabel? (y/n) "
msgstr "Voulez-vous créer un libellé de disque ? (y/n) "
-#: fdisk/fdiskbsdlabel.c:461
+#: fdisk/fdiskbsdlabel.c:466
msgid "bytes/sector"
msgstr "octets/secteur"
-#: fdisk/fdiskbsdlabel.c:462
+#: fdisk/fdiskbsdlabel.c:467
msgid "sectors/track"
msgstr "secteurs/piste"
-#: fdisk/fdiskbsdlabel.c:463
+#: fdisk/fdiskbsdlabel.c:468
msgid "tracks/cylinder"
msgstr "pistes/cylindre"
-#: fdisk/fdiskbsdlabel.c:471
+#: fdisk/fdiskbsdlabel.c:476
msgid "sectors/cylinder"
msgstr "secteurs/cylindre"
-#: fdisk/fdiskbsdlabel.c:475
+#: fdisk/fdiskbsdlabel.c:480
msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
msgstr "Doit être <= secteurs/piste * pistes/cylindre (par défaut).\n"
-#: fdisk/fdiskbsdlabel.c:477
+#: fdisk/fdiskbsdlabel.c:482
msgid "rpm"
msgstr "tpm"
-#: fdisk/fdiskbsdlabel.c:478
+#: fdisk/fdiskbsdlabel.c:483
msgid "interleave"
msgstr "interleave"
-#: fdisk/fdiskbsdlabel.c:479
+#: fdisk/fdiskbsdlabel.c:484
msgid "trackskew"
msgstr "trackskew"
-#: fdisk/fdiskbsdlabel.c:480
+#: fdisk/fdiskbsdlabel.c:485
msgid "cylinderskew"
msgstr "cylinderskew"
-#: fdisk/fdiskbsdlabel.c:481
+#: fdisk/fdiskbsdlabel.c:486
msgid "headswitch"
msgstr "headswitch"
-#: fdisk/fdiskbsdlabel.c:482
+#: fdisk/fdiskbsdlabel.c:487
msgid "track-to-track seek"
msgstr "track-to-track seek"
-#: fdisk/fdiskbsdlabel.c:523
+#: fdisk/fdiskbsdlabel.c:528
#, c-format
msgid "Bootstrap: %sboot -> boot%s (%s): "
msgstr "Amorce : %sboot -> boot%s (%s) : "
-#: fdisk/fdiskbsdlabel.c:548
+#: fdisk/fdiskbsdlabel.c:553
msgid "Bootstrap overlaps with disk label!\n"
msgstr "L'amorce chevauche le libellé de disque !\n"
-#: fdisk/fdiskbsdlabel.c:569 fdisk/fdiskbsdlabel.c:571
+#: fdisk/fdiskbsdlabel.c:574 fdisk/fdiskbsdlabel.c:576
#, c-format
msgid "Bootstrap installed on %s.\n"
msgstr "Amorce installée sur %s.\n"
-#: fdisk/fdiskbsdlabel.c:593
+#: fdisk/fdiskbsdlabel.c:598
#, c-format
msgid "Partition (a-%c): "
msgstr "Partition (a-%c) : "
-#: fdisk/fdiskbsdlabel.c:624
+#: fdisk/fdiskbsdlabel.c:629
msgid "This partition already exists.\n"
msgstr "Cette partition existe déjà .\n"
-#: fdisk/fdiskbsdlabel.c:744
+#: fdisk/fdiskbsdlabel.c:755
#, c-format
msgid "Warning: too many partitions (%d, maximum is %d).\n"
msgstr ""
"Avertissement : partitions trop nombreuses (%d, le nombre maximum est %d).\n"
-#: fdisk/fdiskbsdlabel.c:791
+#: fdisk/fdiskbsdlabel.c:803
msgid ""
"\n"
"Syncing disks.\n"
@@ -5002,143 +5235,129 @@ msgstr "getopt (avancé) 1.1.0\n"
msgid "internal error, contact the author."
msgstr "Erreur interne, contactez l'auteur."
-#: hwclock/cmos.c:168
+#: hwclock/cmos.c:172
msgid "booted from MILO\n"
msgstr "amorçé à partir de MILO\n"
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:181
msgid "Ruffian BCD clock\n"
msgstr "horloge Ruffian BCD\n"
-#: hwclock/cmos.c:193
+#: hwclock/cmos.c:197
#, c-format
msgid "clockport adjusted to 0x%x\n"
msgstr "port horloge ajusté à 0x%x\n"
-#: hwclock/cmos.c:205
+#: hwclock/cmos.c:209
msgid "funky TOY!\n"
msgstr "funky TOY!\n"
-#: hwclock/cmos.c:259
+#: hwclock/cmos.c:263
#, c-format
msgid "%s: atomic %s failed for 1000 iterations!"
msgstr "%s : échec de %s atomique pour 1000 itérations !"
-#: hwclock/cmos.c:583
+#: hwclock/cmos.c:587
#, c-format
msgid "Cannot open /dev/port: %s"
msgstr "Impossible d'ouvrir /dev/port : %s"
-#: hwclock/cmos.c:590
+#: hwclock/cmos.c:594
msgid "I failed to get permission because I didn't try.\n"
msgstr ""
"Je n'ai pas réussi à obtenir l'autorisation parce que je n'ai pas essayé.\n"
-#: hwclock/cmos.c:593
+#: hwclock/cmos.c:597
#, c-format
msgid "%s is unable to get I/O port access: the iopl(3) call failed.\n"
msgstr "%s ne peut pas accéder au port d'E/S : l'appel à iopl(3) a échoué.\n"
-#: hwclock/cmos.c:596
+#: hwclock/cmos.c:600
msgid "Probably you need root privileges.\n"
msgstr "Vous avez probablement besoin des privilèges root.\n"
-#: hwclock/hwclock.c:219
+#: hwclock/hwclock.c:223
#, c-format
msgid "Assuming hardware clock is kept in %s time.\n"
msgstr "Suppose que l'horloge matérielle est à l'heure %s.\n"
-#: hwclock/hwclock.c:220 hwclock/hwclock.c:314
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
msgid "UTC"
msgstr "UTC"
-#: hwclock/hwclock.c:220 hwclock/hwclock.c:313
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
msgid "local"
msgstr "local"
-#: hwclock/hwclock.c:297
+#: hwclock/hwclock.c:303
#, c-format
msgid "%s: Warning: unrecognized third line in adjtime file\n"
msgstr ""
"%s : Avertissement : le fichier adjtime contient une troisième ligne non "
"reconnue.\n"
-#: hwclock/hwclock.c:299
+#: hwclock/hwclock.c:305
msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
msgstr "(Attendu : `UTC' ou `LOCAL' ou rien.)\n"
-#: hwclock/hwclock.c:308
+#: hwclock/hwclock.c:312
#, fuzzy, c-format
msgid "Last drift adjustment done at %ld seconds after 1969\n"
msgstr ""
"Dernier ajustement du facteur de dérive effectué %d secondes après 1969\n"
-#: hwclock/hwclock.c:310
+#: hwclock/hwclock.c:314
#, fuzzy, c-format
msgid "Last calibration done at %ld seconds after 1969\n"
msgstr "Dernier calibrage effectué %d secondes après 1969\n"
-#: hwclock/hwclock.c:312
+#: hwclock/hwclock.c:316
#, c-format
msgid "Hardware clock is on %s time\n"
msgstr "L'horloge matérielle est à l'heure %s\n"
-#: hwclock/hwclock.c:314
+#: hwclock/hwclock.c:318
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.
-#.
-#. -----------------------------------------------------------------------------
-#: hwclock/hwclock.c:336
+#: hwclock/hwclock.c:342
msgid "Waiting for clock tick...\n"
msgstr "Attente du tic de l'horloge...\n"
-#: hwclock/hwclock.c:340
+#: hwclock/hwclock.c:346
msgid "...got clock tick\n"
msgstr "...tic de l'horloge reçu\n"
-#: hwclock/hwclock.c:391
+#: hwclock/hwclock.c:399
#, c-format
msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
msgstr ""
"Valeurs incorrectes dans l'horloge matérielle : %4d/%.2d/%.2d %.2d:%.2d:"
"%.2d\n"
-#: hwclock/hwclock.c:399
+#: hwclock/hwclock.c:407
#, c-format
msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
msgstr ""
"Heure à l'horloge matérielle : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld secondes "
"depuis 1969\n"
-#: hwclock/hwclock.c:427
+#: hwclock/hwclock.c:435
#, c-format
msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
msgstr "Heure lue à l'horloge matérielle : %4d/%.2d/%.2d %02d:%02d:%02d\n"
-#: hwclock/hwclock.c:454
+#: hwclock/hwclock.c:462
#, fuzzy, c-format
msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
msgstr ""
"Réglage de l'horloge matérielle à %.2d:%.2d:%.2d = %d secondes depuis 1969\n"
-#: hwclock/hwclock.c:460
+#: hwclock/hwclock.c:468
msgid "Clock not changed - testing only.\n"
msgstr "Horloge non modifiée. Test.\n"
-#: hwclock/hwclock.c:508
+#: hwclock/hwclock.c:516
#, c-format
msgid ""
"Time elapsed since reference time has been %.6f seconds.\n"
@@ -5147,7 +5366,7 @@ msgstr ""
"Le temps écoulé depuis l'heure de référence est de %.6f secondes.\n"
"Délai supplémentaire jusqu'à la prochaine seconde.\n"
-#: hwclock/hwclock.c:532
+#: hwclock/hwclock.c:540
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"
@@ -5156,20 +5375,20 @@ msgstr ""
"jour du mois) ou en dehors de l'intervalle pris en charge (comme l'année "
"2095).\n"
-#: hwclock/hwclock.c:542
+#: hwclock/hwclock.c:550
#, c-format
msgid "%s %.6f seconds\n"
msgstr "%s %.6f secondes\n"
-#: hwclock/hwclock.c:576
+#: hwclock/hwclock.c:584
msgid "No --date option specified.\n"
msgstr "Pas d'option --date spécifiée.\n"
-#: hwclock/hwclock.c:582
+#: hwclock/hwclock.c:590
msgid "--date argument too long\n"
msgstr ""
-#: hwclock/hwclock.c:589
+#: hwclock/hwclock.c:597
msgid ""
"The value of the --date option is not a valid date.\n"
"In particular, it contains quotation marks.\n"
@@ -5177,23 +5396,23 @@ msgstr ""
"La valeur de l'option --date n'est pas une date valide.\n"
"Elle contient, en particulier, des points d'interrogation.\n"
-#: hwclock/hwclock.c:597
+#: hwclock/hwclock.c:605
#, c-format
msgid "Issuing date command: %s\n"
msgstr "Réponse de la commande date : %s\n"
-#: hwclock/hwclock.c:601
+#: hwclock/hwclock.c:609
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é."
-#: hwclock/hwclock.c:609
+#: hwclock/hwclock.c:617
#, c-format
msgid "response from date command = %s\n"
msgstr "Réponse de la commande date = %s\n"
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:619
#, c-format
msgid ""
"The date command issued by %s returned unexpected results.\n"
@@ -5208,7 +5427,7 @@ msgstr ""
"Le résultat était :\n"
" %s\n"
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:631
#, c-format
msgid ""
"The date command issued by %s returned something other than an integer where "
@@ -5225,12 +5444,12 @@ msgstr ""
"Le résultat était :\n"
" %s\n"
-#: hwclock/hwclock.c:634
+#: hwclock/hwclock.c:642
#, fuzzy, c-format
msgid "date string %s equates to %ld seconds since 1969.\n"
msgstr "La chaîne de date %s équivaut à %d secondes depuis 1969.\n"
-#: hwclock/hwclock.c:666
+#: hwclock/hwclock.c:674
msgid ""
"The Hardware Clock does not contain a valid time, so we cannot set the "
"System Time from it.\n"
@@ -5238,34 +5457,34 @@ msgstr ""
"L'horloge matérielle ne contient pas d'heure valide. On ne peut donc pas "
"régler l'horloge système à partir de celle-ci.\n"
-#: hwclock/hwclock.c:688
+#: hwclock/hwclock.c:696
msgid "Calling settimeofday:\n"
msgstr "Appel de settimeofday :\n"
-#: hwclock/hwclock.c:689
+#: hwclock/hwclock.c:697
#, c-format
msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
-#: hwclock/hwclock.c:691
+#: hwclock/hwclock.c:699
#, c-format
msgid "\ttz.tz_minuteswest = %d\n"
msgstr "\ttz.tz_minuteswest = %d\n"
-#: hwclock/hwclock.c:694
+#: hwclock/hwclock.c:702
msgid "Not setting system clock because running in test mode.\n"
msgstr ""
"L'horloge système n'a pas été modifiée car l'exécution est en mode test.\n"
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:711
msgid "Must be superuser to set system clock.\n"
msgstr "Vous devez être un superutilisateur pour définir l'horloge système.\n"
-#: hwclock/hwclock.c:704
+#: hwclock/hwclock.c:714
msgid "settimeofday() failed"
msgstr "settimeofday() a échoué."
-#: hwclock/hwclock.c:737
+#: hwclock/hwclock.c:744
msgid ""
"Not adjusting drift factor because the Hardware Clock previously contained "
"garbage.\n"
@@ -5273,7 +5492,16 @@ msgstr ""
"Pas de modification du facteur de dérive car l'horloge matérielle contient "
"des déchets.\n"
-#: hwclock/hwclock.c:741
+#: hwclock/hwclock.c:749
+#, fuzzy
+msgid ""
+"Not adjusting drift factor because last calibration time is zero,\n"
+"so history is bad and calibration startover is necessary.\n"
+msgstr ""
+"Le facteur de dérive n'a pas été modifié car le dernier calibrage a moins "
+"d'un jour.\n"
+
+#: hwclock/hwclock.c:755
msgid ""
"Not adjusting drift factor because it has been less than a day since the "
"last calibration.\n"
@@ -5281,10 +5509,10 @@ msgstr ""
"Le facteur de dérive n'a pas été modifié car le dernier calibrage a moins "
"d'un jour.\n"
-#: hwclock/hwclock.c:750
-#, c-format
+#: hwclock/hwclock.c:803
+#, fuzzy, c-format
msgid ""
-"Clock drifted %d seconds in the past %d seconds in spite of a drift factor "
+"Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
"of %f seconds/day.\n"
"Adjusting drift factor by %f seconds/day\n"
msgstr ""
@@ -5292,22 +5520,22 @@ msgstr ""
"le facteur de dérive de %f secondes par jour.\n"
"Ajustement du facteur de dérive à %f secondes par jour.\n"
-#: hwclock/hwclock.c:801
+#: hwclock/hwclock.c:854
#, c-format
msgid "Time since last adjustment is %d seconds\n"
msgstr "Il s'est écoulé %d secondes depuis le dernier ajustement.\n"
-#: hwclock/hwclock.c:803
+#: hwclock/hwclock.c:856
#, c-format
msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
msgstr ""
"Il faut ajouter %d secondes, et se référer à %.6f secondes dans le passé.\n"
-#: hwclock/hwclock.c:832
+#: hwclock/hwclock.c:885
msgid "Not updating adjtime file because of testing mode.\n"
msgstr "Fichier adjtime non modifiable en mode test.\n"
-#: hwclock/hwclock.c:833
+#: hwclock/hwclock.c:886
#, c-format
msgid ""
"Would have written the following to %s:\n"
@@ -5316,37 +5544,37 @@ msgstr ""
"Aurait écrit ce qui suit sur %s :\n"
"%s"
-#: hwclock/hwclock.c:857
+#: hwclock/hwclock.c:910
msgid "Drift adjustment parameters not updated.\n"
msgstr "Facteur de dérive non modifié.\n"
-#: hwclock/hwclock.c:898
+#: hwclock/hwclock.c:951
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"
-#: hwclock/hwclock.c:922
+#: hwclock/hwclock.c:983
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"
-#: hwclock/hwclock.c:948
+#: hwclock/hwclock.c:1009
#, c-format
msgid "Using %s.\n"
msgstr "Utilisation de %s.\n"
-#: hwclock/hwclock.c:950
+#: hwclock/hwclock.c:1011
msgid "No usable clock interface found.\n"
msgstr "Aucune interface avec l'horloge utilisable trouvée.\n"
-#: hwclock/hwclock.c:1045
+#: hwclock/hwclock.c:1107
msgid "Unable to set system clock.\n"
msgstr "Impossible de régler l'horloge système.\n"
-#: hwclock/hwclock.c:1076
+#: hwclock/hwclock.c:1137
msgid ""
"The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
"machine.\n"
@@ -5360,16 +5588,16 @@ msgstr ""
"(et n'est, par conséquent, sans doute pas exécutée sur un Alpha). Aucune "
"action entreprise.\n"
-#: hwclock/hwclock.c:1085
+#: hwclock/hwclock.c:1146
msgid "Unable to get the epoch value from the kernel.\n"
msgstr "Impossible d'obtenir la valeur epoch depuis le kernel.\n"
-#: hwclock/hwclock.c:1087
+#: hwclock/hwclock.c:1148
#, c-format
msgid "Kernel is assuming an epoch value of %lu\n"
msgstr "Le kernel suppose une valeur epoch de %lu\n"
-#: hwclock/hwclock.c:1090
+#: hwclock/hwclock.c:1151
msgid ""
"To set the epoch value, you must use the 'epoch' option to tell to what "
"value to set it.\n"
@@ -5377,16 +5605,16 @@ msgstr ""
"Pour définir une valeur epoch, utilisez l'option 'epoch' pour indiquer la "
"valeur sur laquelle elle doit être réglée.\n"
-#: hwclock/hwclock.c:1093
+#: hwclock/hwclock.c:1154
#, c-format
msgid "Not setting the epoch to %d - testing only.\n"
msgstr "Valeur epoch non définie sur %d. Test uniquement.\n"
-#: hwclock/hwclock.c:1096
+#: hwclock/hwclock.c:1157
msgid "Unable to set the epoch value in the kernel.\n"
msgstr "Impossible de modifier la valeur epoch du kernel.\n"
-#: hwclock/hwclock.c:1125
+#: hwclock/hwclock.c:1191
#, c-format
msgid ""
"hwclock - query and set the hardware clock (RTC)\n"
@@ -5418,26 +5646,27 @@ msgid ""
" either --utc or --localtime\n"
msgstr ""
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1218
msgid ""
" --jensen, --arc, --srm, --funky-toy\n"
" tell hwclock the type of alpha you have (see hwclock(8))\n"
msgstr ""
-#: hwclock/hwclock.c:1257
+#: hwclock/hwclock.c:1392
#, 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"
-#: hwclock/hwclock.c:1267
+#: hwclock/hwclock.c:1398
+#, fuzzy
msgid ""
-"You have specified multiple function options.\n"
+"You have specified multiple functions.\n"
"You can only perform one function at a time.\n"
msgstr ""
"Vous avez défini plusieurs options de fonction.\n"
"Vous pouvez effectuer une seule fonction à la fois.\n"
-#: hwclock/hwclock.c:1273
+#: hwclock/hwclock.c:1405
#, c-format
msgid ""
"%s: The --utc and --localtime options are mutually exclusive. You specified "
@@ -5446,7 +5675,7 @@ msgstr ""
"%s : Les options --utc et --localtime s'excluent mutuellement. Vous avez "
"défini les deux.\n"
-#: hwclock/hwclock.c:1279
+#: hwclock/hwclock.c:1412
#, fuzzy, c-format
msgid ""
"%s: The --adjust and --noadjfile options are mutually exclusive. You "
@@ -5455,27 +5684,27 @@ msgstr ""
"%s : Les options --utc et --localtime s'excluent mutuellement. Vous avez "
"défini les deux.\n"
-#: hwclock/hwclock.c:1285
+#: hwclock/hwclock.c:1419
#, c-format
msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
msgstr ""
-#: hwclock/hwclock.c:1298
+#: hwclock/hwclock.c:1433
msgid "No usable set-to time. Cannot set clock.\n"
msgstr "Aucune heure utilisable. Impossible de régler l'horloge.\n"
-#: hwclock/hwclock.c:1313
+#: hwclock/hwclock.c:1449
msgid "Sorry, only the superuser can change the Hardware Clock.\n"
msgstr ""
"Désolé, seul le superutilisateur est autorisé à modifier l'horloge "
"matérielle.\n"
-#: hwclock/hwclock.c:1317
+#: hwclock/hwclock.c:1454
msgid "Sorry, only the superuser can change the System Clock.\n"
msgstr ""
"Désolé, seul le superutilisateur est autorisé à modifier l'horloge système.\n"
-#: hwclock/hwclock.c:1321
+#: hwclock/hwclock.c:1459
msgid ""
"Sorry, only the superuser can change the Hardware Clock epoch in the "
"kernel.\n"
@@ -5483,12 +5712,12 @@ msgstr ""
"Désolé, seul le superutilisateur est autorisé à modifier la valeur epoch de "
"l'horloge matérielle dans le kernel.\n"
-#: hwclock/hwclock.c:1341
+#: hwclock/hwclock.c:1479
msgid "Cannot access the Hardware Clock via any known method.\n"
msgstr ""
"Impossible d'accéder à l'horloge matériel à l'aide d'une méthode connue.\n"
-#: hwclock/hwclock.c:1344
+#: hwclock/hwclock.c:1483
msgid ""
"Use the --debug option to see the details of our search for an access "
"method.\n"
@@ -5496,100 +5725,95 @@ msgstr ""
"Utilisez l'option --debug pour afficher les détails de la recherche d'une "
"méthode d'accès.\n"
-#: hwclock/kd.c:42
+#: hwclock/kd.c:43
msgid "Waiting in loop for time from KDGHWCLK to change\n"
msgstr "Attente en boucle du changement d'heure dans KDGHWCLK.\n"
-#: hwclock/kd.c:45
+#: hwclock/kd.c:46
msgid "KDGHWCLK ioctl to read time failed"
msgstr "La lecture de l'heure par KDGHWCLK ioctl a échoué."
-#: hwclock/kd.c:66 hwclock/rtc.c:174
+#: hwclock/kd.c:67 hwclock/rtc.c:187
msgid "Timed out waiting for time change.\n"
msgstr "Temporisation de l'attente du changement d'heure.\n"
-#: hwclock/kd.c:70
+#: hwclock/kd.c:71
msgid "KDGHWCLK ioctl to read time failed in loop"
msgstr "La lecture de l'heure par KDGHWCLK ioctl a échoué dans la boucle."
-#: hwclock/kd.c:92
+#: hwclock/kd.c:93
#, fuzzy, c-format
msgid "ioctl() failed to read time from %s"
msgstr "ioctl() a échoué lors de la lecture de l'heure de /dev/tty1."
-#: hwclock/kd.c:128
+#: hwclock/kd.c:129
#, fuzzy
msgid "ioctl KDSHWCLK failed"
msgstr "Échec de KDGHWCLK ioctl."
-#: hwclock/kd.c:165
+#: hwclock/kd.c:166
#, fuzzy
msgid "Can't open /dev/tty1 or /dev/vc/1"
msgstr "Impossible d'ouvrir /dev/tty1."
-#: hwclock/kd.c:170
+#: hwclock/kd.c:171
msgid "KDGHWCLK ioctl failed"
msgstr "Échec de KDGHWCLK ioctl."
-#: hwclock/rtc.c:136
+#: hwclock/rtc.c:115 hwclock/rtc.c:208
+#, c-format
+msgid "open() of %s failed"
+msgstr "open() de %s a échoué."
+
+#: hwclock/rtc.c:149
#, c-format
msgid "ioctl() to %s to read the time failed.\n"
msgstr "ioctl() sur %s pour lire l'heure a échoué.\n"
-#: hwclock/rtc.c:158
+#: hwclock/rtc.c:171
#, c-format
msgid "Waiting in loop for time from %s to change\n"
msgstr "Attente en boucle du changement de l'heure de %s.\n"
-#: hwclock/rtc.c:195 hwclock/rtc.c:250
-#, c-format
-msgid "open() of %s failed"
-msgstr "open() de %s a échoué."
-
-#: hwclock/rtc.c:213
+#: hwclock/rtc.c:226
#, c-format
msgid "%s does not have interrupt functions. "
msgstr "%s n'a pas de fonctions d'interruption. "
-#: hwclock/rtc.c:222
+#: hwclock/rtc.c:235
#, c-format
msgid "read() to %s to wait for clock tick failed"
msgstr "read() sur %s pour attendre le tic de l'horloge a échoué."
-#: hwclock/rtc.c:231
+#: hwclock/rtc.c:244
#, c-format
msgid "ioctl() to %s to turn off update interrupts failed"
msgstr ""
"ioctl() sur %s pour désactiver les interruptions de mise à jour a échoué."
-#: hwclock/rtc.c:234
+#: hwclock/rtc.c:247
#, c-format
msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
msgstr ""
"ioctl() sur %s pour activer les interruptions de mise à jour a échoué de "
"manière inattendue."
-#: hwclock/rtc.c:274 hwclock/rtc.c:358 hwclock/rtc.c:404
-#, c-format
-msgid "Unable to open %s"
-msgstr "Impossible d'ouvrir %s."
-
-#: hwclock/rtc.c:300
+#: hwclock/rtc.c:306
#, c-format
msgid "ioctl() to %s to set the time failed.\n"
msgstr "ioctl() sur %s pour régler l'heure a échoué.\n"
-#: hwclock/rtc.c:306
+#: hwclock/rtc.c:312
#, c-format
msgid "ioctl(%s) was successful.\n"
msgstr "ioctl(%s) a abouti.\n"
-#: hwclock/rtc.c:335
+#: hwclock/rtc.c:341
#, c-format
msgid "Open of %s failed"
msgstr "L'ouverture de %s a échoué."
-#: hwclock/rtc.c:353 hwclock/rtc.c:399
+#: hwclock/rtc.c:359 hwclock/rtc.c:405
#, c-format
msgid ""
"To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
@@ -5600,12 +5824,17 @@ msgstr ""
"accéder au pilote de périphérique Linux 'rtc' depuis le fichier spécial de "
"périphérique %s. Ce fichier est introuvable sur le système.\n"
-#: hwclock/rtc.c:365
+#: hwclock/rtc.c:364 hwclock/rtc.c:410
+#, c-format
+msgid "Unable to open %s"
+msgstr "Impossible d'ouvrir %s."
+
+#: hwclock/rtc.c:371
#, c-format
msgid "ioctl(RTC_EPOCH_READ) to %s failed"
msgstr "ioctl(RTC_EPOCH_READ) sur %s a échoué."
-#: hwclock/rtc.c:371
+#: hwclock/rtc.c:377
#, c-format
msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
msgstr "Valeur epoch lue %ld depuis %s avec RTC_EPOCH_READ ioctl.\n"
@@ -5613,19 +5842,19 @@ msgstr "Valeur epoch lue %ld depuis %s avec RTC_EPOCH_READ ioctl.\n"
#. kernel would not accept this epoch value
#. Hmm - bad habit, deciding not to do what the user asks
#. just because one believes that the kernel might not like it.
-#: hwclock/rtc.c:391
+#: hwclock/rtc.c:397
#, c-format
msgid "The epoch value may not be less than 1900. You requested %ld\n"
msgstr ""
"La valeur epoch doit être supérieure ou égale à 1900. Vous avez demandé %"
"ld.\n"
-#: hwclock/rtc.c:409
+#: hwclock/rtc.c:415
#, c-format
msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
msgstr "Réglage de la valeur epoch sur %ld avec RTC_EPOCH_SET ioctl sur %s.\n"
-#: hwclock/rtc.c:414
+#: hwclock/rtc.c:420
#, c-format
msgid ""
"The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
@@ -5633,41 +5862,11 @@ msgstr ""
"Le pilote de périphérique du kernel pour %s ne dispose pas de RTC_EPOCH_SET "
"ioctl.\n"
-#: hwclock/rtc.c:417
+#: hwclock/rtc.c:423
#, c-format
msgid "ioctl(RTC_EPOCH_SET) to %s failed"
msgstr "ioctl(RTC_EPOCH_SET) sur %s a échoué."
-#: hwclock/shhopt.c:255 hwclock/shhopt.c:281
-#, c-format
-msgid "invalid number `%s'\n"
-msgstr "nombre invalide `%s'\n"
-
-#: hwclock/shhopt.c:258 hwclock/shhopt.c:284
-#, c-format
-msgid "number `%s' to `%s' out of range\n"
-msgstr "nombre de `%s' à `%s' hors plage\n"
-
-#: hwclock/shhopt.c:398
-#, c-format
-msgid "unrecognized option `%s'\n"
-msgstr "option non reconnue `%s'\n"
-
-#: hwclock/shhopt.c:411 hwclock/shhopt.c:449
-#, c-format
-msgid "option `%s' requires an argument\n"
-msgstr "l'option `%s' requiert un argument\n"
-
-#: hwclock/shhopt.c:417
-#, c-format
-msgid "option `%s' doesn't allow an argument\n"
-msgstr "l'option `%s' n'autorise pas d'argument\n"
-
-#: hwclock/shhopt.c:439
-#, c-format
-msgid "unrecognized option `-%c'\n"
-msgstr "option non reconnue `-%c'\n"
-
#: login-utils/agetty.c:312
msgid "calling open_tty\n"
msgstr "Appel de open_tty\n"
@@ -6708,7 +6907,7 @@ msgstr "Échec de l'ouverture du répertoire.\n"
msgid "fork failed\n"
msgstr "Échec de fork.\n"
-#: login-utils/simpleinit.c:512 text-utils/more.c:1705
+#: login-utils/simpleinit.c:512 text-utils/more.c:1706
msgid "exec failed\n"
msgstr "Échec de exec.\n"
@@ -7502,125 +7701,125 @@ msgstr "[mntent] : la ligne %d dans %s est incorrecte%s\n"
msgid "; rest of file ignored"
msgstr "; reste du fichier ignoré"
-#: mount/mount.c:379
+#: mount/mount.c:381
#, c-format
msgid "mount: according to mtab, %s is already mounted on %s"
msgstr "mount : selon mtab, %s est déjà monté sur %s"
-#: mount/mount.c:383
+#: mount/mount.c:385
#, c-format
msgid "mount: according to mtab, %s is mounted on %s"
msgstr "mount : selon mtab, %s est monté sur %s"
-#: mount/mount.c:404
+#: mount/mount.c:406
#, c-format
msgid "mount: can't open %s for writing: %s"
msgstr "mount : impossible d'ouvrir %s pour écriture : %s"
-#: mount/mount.c:419 mount/mount.c:638
+#: mount/mount.c:421 mount/mount.c:640
#, c-format
msgid "mount: error writing %s: %s"
msgstr "mount : erreur lors de l'écriture de %s: %s"
-#: mount/mount.c:426
+#: mount/mount.c:428
#, c-format
msgid "mount: error changing mode of %s: %s"
msgstr "mount : erreur lors du changement du mode de %s: %s"
-#: mount/mount.c:472
+#: mount/mount.c:474
#, c-format
msgid "%s looks like swapspace - not mounted"
msgstr "%s ressemble à un espace d'échange - non monté"
-#: mount/mount.c:532
+#: mount/mount.c:534
msgid "mount failed"
msgstr "Échec du montage"
-#: mount/mount.c:534
+#: mount/mount.c:536
#, c-format
msgid "mount: only root can mount %s on %s"
msgstr "mount : seul l'utilisateur root peut monter %s sur %s"
-#: mount/mount.c:562
+#: mount/mount.c:564
msgid "mount: loop device specified twice"
msgstr "mount : périphérique de boucle spécifié deux fois"
-#: mount/mount.c:567
+#: mount/mount.c:569
msgid "mount: type specified twice"
msgstr "mount : type spécifié deux fois"
-#: mount/mount.c:579
+#: mount/mount.c:581
msgid "mount: skipping the setup of a loop device\n"
msgstr "mount : saut de la configuration d'un périphérique de boucle\n"
-#: mount/mount.c:588
+#: mount/mount.c:590
#, c-format
msgid "mount: going to use the loop device %s\n"
msgstr "mount : le périphérique de boucle %s va être utilisé\n"
-#: mount/mount.c:592
+#: mount/mount.c:594
msgid "mount: failed setting up loop device\n"
msgstr "mount : échec de la configuration du périphérique de boucle\n"
-#: mount/mount.c:596
+#: mount/mount.c:598
msgid "mount: setup loop device successfully\n"
msgstr "mount : la configuration du périphérique de boucle a abouti\n"
-#: mount/mount.c:633
+#: mount/mount.c:635
#, c-format
msgid "mount: can't open %s: %s"
msgstr "mount : impossible d'ouvrir %s: %s"
-#: mount/mount.c:656
+#: mount/mount.c:658
#, fuzzy, c-format
msgid "mount: cannot open %s for setting speed"
msgstr "mount : impossible d'ouvrir %s pour définir la vitesse"
-#: mount/mount.c:659
+#: mount/mount.c:661
#, c-format
msgid "mount: cannot set speed: %s"
msgstr "mount : impossible de définir la vitesse : %s"
-#: mount/mount.c:720 mount/mount.c:1265
+#: mount/mount.c:722 mount/mount.c:1295
#, c-format
msgid "mount: cannot fork: %s"
msgstr "mount : fork impossible : %s"
-#: mount/mount.c:800
+#: mount/mount.c:802
msgid "mount: this version was compiled without support for the type `nfs'"
msgstr ""
"mount : cette version a été compilée sans prise en charge du type `nfs'"
-#: mount/mount.c:839
+#: mount/mount.c:841
msgid "mount: failed with nfs mount version 4, trying 3..\n"
msgstr "mount : échec avec nfs mount version 4, essaye avec la 3...\n"
-#: mount/mount.c:850
+#: mount/mount.c:852
msgid ""
"mount: I could not determine the filesystem type, and none was specified"
msgstr ""
"mount : Impossible de déterminer le type du système de fichiers et aucun "
"n'était spécifié."
-#: mount/mount.c:853
+#: mount/mount.c:855
msgid "mount: you must specify the filesystem type"
msgstr "mount : vous devez indiquer le type de système de fichiers."
#. should not happen
-#: mount/mount.c:856
+#: mount/mount.c:858
msgid "mount: mount failed"
msgstr "mount : échec du montage"
-#: mount/mount.c:862 mount/mount.c:897
+#: mount/mount.c:864 mount/mount.c:899
#, c-format
msgid "mount: mount point %s is not a directory"
msgstr "mount : le point de montage %s n'est pas un répertoire."
-#: mount/mount.c:864
+#: mount/mount.c:866
msgid "mount: permission denied"
msgstr "mount : permission refusée."
-#: mount/mount.c:866
+#: mount/mount.c:868
msgid "mount: must be superuser to use mount"
msgstr ""
"mount : vous devez être l'utilisateur root pour utiliser la fonction de "
@@ -7628,38 +7827,38 @@ msgstr ""
#. heuristic: if /proc/version exists, then probably proc is mounted
#. proc mounted?
-#: mount/mount.c:870 mount/mount.c:874
+#: mount/mount.c:872 mount/mount.c:876
#, c-format
msgid "mount: %s is busy"
msgstr "mount : %s est occupé"
#. no
#. yes, don't mention it
-#: mount/mount.c:876
+#: mount/mount.c:878
msgid "mount: proc already mounted"
msgstr "mount : proc déjà monté"
-#: mount/mount.c:878
+#: mount/mount.c:880
#, c-format
msgid "mount: %s already mounted or %s busy"
msgstr "mount : %s déjà monté ou %s occupé"
-#: mount/mount.c:884
+#: mount/mount.c:886
#, c-format
msgid "mount: mount point %s does not exist"
msgstr "mount : le point de montage %s n'existe pas."
-#: mount/mount.c:886
+#: mount/mount.c:888
#, c-format
msgid "mount: mount point %s is a symbolic link to nowhere"
msgstr "mount : le point de montage %s est un lien symbolique avec rien"
-#: mount/mount.c:889
+#: mount/mount.c:891
#, c-format
msgid "mount: special device %s does not exist"
msgstr "mount : le périphérique spécial %s n'existe pas."
-#: mount/mount.c:899
+#: mount/mount.c:901
#, c-format
msgid ""
"mount: special device %s does not exist\n"
@@ -7668,12 +7867,12 @@ msgstr ""
"mount : le périphérique spécial %s n'existe pas\n"
" (un préfixe de chemin n'est pas un répertoire)\n"
-#: mount/mount.c:912
+#: mount/mount.c:914
#, c-format
msgid "mount: %s not mounted already, or bad option"
msgstr "mount : %s pas encore monté, ou option incorrecte"
-#: mount/mount.c:914
+#: mount/mount.c:916
#, c-format
msgid ""
"mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -7682,35 +7881,35 @@ msgstr ""
"mount : type fs incorrect, option incorrecte, superbloc incorrect sur %s,\n"
" ou trop de systèmes de fichiers montés"
-#: mount/mount.c:948
+#: mount/mount.c:950
msgid "mount table full"
msgstr "Table de montage complète"
-#: mount/mount.c:950
+#: mount/mount.c:952
#, c-format
msgid "mount: %s: can't read superblock"
msgstr "mount : %s: impossible de lire le superbloc"
-#: mount/mount.c:954
+#: mount/mount.c:956
#, fuzzy, c-format
msgid "mount: %s: unknown device"
msgstr "umount : %s : périphérique de bloc non valide"
-#: mount/mount.c:959
+#: mount/mount.c:961
#, c-format
msgid "mount: fs type %s not supported by kernel"
msgstr "mount : type fs %s non pris en charge par le kernel"
-#: mount/mount.c:971
+#: mount/mount.c:973
#, c-format
msgid "mount: probably you meant %s"
msgstr "mount : vous vouliez sans doute dire %s."
-#: mount/mount.c:973
+#: mount/mount.c:975
msgid "mount: maybe you meant iso9660 ?"
msgstr "mount : vous vouliez peut-être dire iso9660 ?"
-#: mount/mount.c:976
+#: mount/mount.c:978
#, c-format
msgid "mount: %s has wrong device number or fs type %s not supported"
msgstr ""
@@ -7718,12 +7917,12 @@ msgstr ""
"pris en charge."
#. strange ...
-#: mount/mount.c:982
+#: mount/mount.c:984
#, c-format
msgid "mount: %s is not a block device, and stat fails?"
msgstr "mount : %s n'est pas un périphérique de bloc. Échec de stat ?"
-#: mount/mount.c:984
+#: mount/mount.c:986
#, c-format
msgid ""
"mount: the kernel does not recognize %s as a block device\n"
@@ -7732,94 +7931,99 @@ msgstr ""
"mount : le kernel ne reconnaît pas %s comme périphérique de bloc\n"
" (peut-être `insmod driver' ?)"
-#: mount/mount.c:987
+#: mount/mount.c:989
#, c-format
msgid "mount: %s is not a block device (maybe try `-o loop'?)"
msgstr "mount : %s n'est pas un périphérique de bloc (essayez `-o loop' ?)."
-#: mount/mount.c:990
+#: mount/mount.c:992
#, c-format
msgid "mount: %s is not a block device"
msgstr "mount : %s n'est pas un périphérique de bloc."
-#: mount/mount.c:993
+#: mount/mount.c:995
#, c-format
msgid "mount: %s is not a valid block device"
msgstr "mount : %s n'est pas un périphérique de bloc valide."
#. pre-linux 1.1.38, 1.1.41 and later
#. linux 1.1.38 and later
-#: mount/mount.c:996
+#: mount/mount.c:998
msgid "block device "
msgstr "Périphérique de bloc"
-#: mount/mount.c:998
+#: mount/mount.c:1000
#, c-format
msgid "mount: cannot mount %s%s read-only"
msgstr "mount : impossible de monter %s%s en lecture seule."
-#: mount/mount.c:1002
+#: mount/mount.c:1004
#, c-format
msgid "mount: %s%s is write-protected but explicit `-w' flag given"
msgstr ""
"mount : %s%s est protégé en écriture mais l'indicateur `-w' a été "
"explicitement donné."
-#: mount/mount.c:1018
+#: mount/mount.c:1020
#, c-format
msgid "mount: %s%s is write-protected, mounting read-only"
msgstr "mount : %s%s est protégé en écriture. Montage en lecture seule."
-#: mount/mount.c:1104
+#: mount/mount.c:1107
#, c-format
msgid "mount: the label %s occurs on both %s and %s\n"
msgstr ""
-#: mount/mount.c:1108
+#: mount/mount.c:1111
#, fuzzy, c-format
msgid "mount: %s duplicate - not mounted"
msgstr "umount : %s: non monté"
-#: mount/mount.c:1118
+#: mount/mount.c:1121
#, c-format
msgid "mount: going to mount %s by %s\n"
msgstr "mount : envisagez de monter %s par %s.\n"
-#: mount/mount.c:1119
+#: mount/mount.c:1122
msgid "UUID"
msgstr "UUID"
-#: mount/mount.c:1119
+#: mount/mount.c:1122
msgid "label"
msgstr "Libellé"
-#: mount/mount.c:1121 mount/mount.c:1521
+#: mount/mount.c:1124 mount/mount.c:1555
msgid "mount: no such partition found"
msgstr "mount : partition introuvable"
-#: mount/mount.c:1129
+#: mount/mount.c:1132
msgid "mount: no type was given - I'll assume nfs because of the colon\n"
msgstr "mount : aucun type donné - nfs supposé en raison du point virgule\n"
+#: mount/mount.c:1137
+#, fuzzy
+msgid "mount: no type was given - I'll assume smb because of the // prefix\n"
+msgstr "mount : aucun type donné - nfs supposé en raison du point virgule\n"
+
#.
#. * Retry in the background.
#.
-#: mount/mount.c:1145
+#: mount/mount.c:1153
#, c-format
msgid "mount: backgrounding \"%s\"\n"
msgstr "mount : tentative de montage en arrière-plan en cours \"%s\"\n"
-#: mount/mount.c:1156
+#: mount/mount.c:1164
#, c-format
msgid "mount: giving up \"%s\"\n"
msgstr "mount : abandon de \"%s\"\n"
-#: mount/mount.c:1216
+#: mount/mount.c:1240
#, c-format
msgid "mount: %s already mounted on %s\n"
msgstr "mount : %s déjà monté sur %s\n"
-#: mount/mount.c:1335
+#: mount/mount.c:1369
#, fuzzy
msgid ""
"Usage: mount -V : print version\n"
@@ -7867,40 +8071,40 @@ msgstr ""
"Autres options : [-nfFrsvw] [-o options].\n"
"Pour plus de détails, voyez man 8 mount .\n"
-#: mount/mount.c:1497
+#: mount/mount.c:1531
msgid "mount: only root can do that"
msgstr "mount : seul l'utilisateur root peut le faire."
-#: mount/mount.c:1502
+#: mount/mount.c:1536
#, c-format
msgid "mount: no %s found - creating it..\n"
msgstr "mount : %s introuvable - création en cours..\n"
-#: mount/mount.c:1516
+#: mount/mount.c:1550
#, c-format
msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
msgstr ""
-#: mount/mount.c:1523
+#: mount/mount.c:1557
#, c-format
msgid "mount: mounting %s\n"
msgstr "mount : montage de %s en cours...\n"
-#: mount/mount.c:1532
+#: mount/mount.c:1566
msgid "nothing was mounted"
msgstr ""
-#: mount/mount.c:1547
+#: mount/mount.c:1581
#, c-format
msgid "mount: cannot find %s in %s"
msgstr "mount : impossible de trouver %s dans %s"
-#: mount/mount.c:1562
+#: mount/mount.c:1596
#, c-format
msgid "mount: can't find %s in %s or %s"
msgstr "mount : impossible de trouver %s dans %s ou %s"
-#: mount/mount_by_label.c:169
+#: mount/mount_by_label.c:199
#, c-format
msgid ""
"mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
@@ -7908,35 +8112,35 @@ msgstr ""
"mount : impossible d'ouvrir %s, tant que la conversion UUID et LABEL n'a pas "
"été faite.\n"
-#: mount/mount_by_label.c:295
+#: mount/mount_by_label.c:325
msgid "mount: bad UUID"
msgstr "mount : UUID incorrect"
-#: mount/mount_guess_fstype.c:487
+#: mount/mount_guess_fstype.c:482
#, fuzzy
msgid "mount: error while guessing filesystem type\n"
msgstr "mount : vous devez indiquer le type de système de fichiers."
-#: mount/mount_guess_fstype.c:496
+#: mount/mount_guess_fstype.c:491
#, c-format
msgid "mount: you didn't specify a filesystem type for %s\n"
msgstr "mount : aucun type de système de fichiers spécifié pour %s\n"
-#: mount/mount_guess_fstype.c:499
+#: mount/mount_guess_fstype.c:494
#, c-format
msgid " I will try all types mentioned in %s or %s\n"
msgstr " Essayer des autres types mentionnés dans %s ou %s\n"
-#: mount/mount_guess_fstype.c:502
+#: mount/mount_guess_fstype.c:497
msgid " and it looks like this is swapspace\n"
msgstr " et il semble que ce soit un espace d'échange\n"
-#: mount/mount_guess_fstype.c:504
+#: mount/mount_guess_fstype.c:499
#, c-format
msgid " I will try type %s\n"
msgstr " Essayer avec le type %s\n"
-#: mount/mount_guess_fstype.c:592
+#: mount/mount_guess_fstype.c:587
#, c-format
msgid "Trying %s\n"
msgstr "Essaye %s\n"
@@ -8030,7 +8234,7 @@ msgstr "Valeur de l'état nfs renvoyée inconnue : %d"
msgid "bug in xstrndup call"
msgstr "Bogue dans l'appel de xstrndup"
-#: mount/swapon.c:51
+#: mount/swapon.c:56
#, c-format
msgid ""
"usage: %s [-hV]\n"
@@ -8043,29 +8247,46 @@ msgstr ""
" %s [-v] [-p priorité] special ...\n"
" %s [-s]\n"
-#: mount/swapon.c:88
+#: mount/swapon.c:66
+#, fuzzy, c-format
+msgid ""
+"usage: %s [-hV]\n"
+" %s -a [-v]\n"
+" %s [-v] special ...\n"
+msgstr ""
+"Usage : %s [-hV]\n"
+" %s -a [-v]\n"
+" %s [-v] [-p priorité] special ...\n"
+" %s [-s]\n"
+
+#: mount/swapon.c:170 mount/swapon.c:234
#, c-format
msgid "%s on %s\n"
msgstr "%s sur %s\n"
-#: mount/swapon.c:93
+#: mount/swapon.c:174
#, c-format
msgid "swapon: cannot stat %s: %s\n"
msgstr "swapon : stat %s impossible: %s\n"
-#: mount/swapon.c:105
+#: mount/swapon.c:185
#, fuzzy, c-format
msgid "swapon: warning: %s has insecure permissions %04o, %04o suggested\n"
msgstr ""
"swapon : avertissement : %s a les permissions non sécurisées %04o, 0600 "
"suggérées.\n"
-#: mount/swapon.c:115
+#: mount/swapon.c:197
#, c-format
msgid "swapon: Skipping file %s - it appears to have holes.\n"
msgstr "swapon : Saut du fichier %s - il semble contenir des trous.\n"
-#: mount/swapon.c:222
+#: mount/swapon.c:240
+#, fuzzy
+msgid "Not superuser.\n"
+msgstr "Non défini\n"
+
+#: mount/swapon.c:298 mount/swapon.c:386
#, c-format
msgid "%s: cannot open %s: %s\n"
msgstr "%s : impossible d'ouvrir %s : %s\n"
@@ -8443,28 +8664,28 @@ msgstr "%s sur %s\n"
msgid "%s: unknown argument: %s\n"
msgstr "%s : signal %s inconnu\n"
-#: sys-utils/ipcs.c:122
+#: sys-utils/ipcs.c:121
#, c-format
msgid "usage : %s -asmq -tclup \n"
msgstr "Usage : %s -asmq -tclup \n"
-#: sys-utils/ipcs.c:123
+#: sys-utils/ipcs.c:122
#, c-format
msgid "\t%s [-s -m -q] -i id\n"
msgstr "\t%s [-s -m -q] -i id\n"
-#: sys-utils/ipcs.c:124
+#: sys-utils/ipcs.c:123
#, c-format
msgid "\t%s -h for help.\n"
msgstr "\t%s -h pour aide.\n"
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:129
#, fuzzy, c-format
msgid ""
"%s provides information on ipc facilities for which you have read access.\n"
msgstr "%s fournit des informations sur les fonctions ipc auxquelles"
-#: sys-utils/ipcs.c:132
+#: sys-utils/ipcs.c:131
msgid ""
"Resource Specification:\n"
"\t-m : shared_mem\n"
@@ -8474,7 +8695,7 @@ msgstr ""
"\t-m : mém_partagée\n"
"\t-q : messages\n"
-#: sys-utils/ipcs.c:133
+#: sys-utils/ipcs.c:132
msgid ""
"\t-s : semaphores\n"
"\t-a : all (default)\n"
@@ -8482,7 +8703,7 @@ msgstr ""
"\t-s : sémaphores\n"
"\t-a : tous (par défaut)\n"
-#: sys-utils/ipcs.c:134
+#: sys-utils/ipcs.c:133
msgid ""
"Output Format:\n"
"\t-t : time\n"
@@ -8494,7 +8715,7 @@ msgstr ""
"\t-p : pid\n"
"\t-c : créateur\n"
-#: sys-utils/ipcs.c:135
+#: sys-utils/ipcs.c:134
msgid ""
"\t-l : limits\n"
"\t-u : summary\n"
@@ -8502,383 +8723,383 @@ msgstr ""
"\t-l : limites\n"
"\t-u : résumé\n"
-#: sys-utils/ipcs.c:136
+#: sys-utils/ipcs.c:135
msgid "-i id [-s -q -m] : details on resource identified by id\n"
msgstr "-i id [-s -q -m] : Détails sur la ressource identifiée par Id\n"
-#: sys-utils/ipcs.c:268
+#: sys-utils/ipcs.c:267
msgid "kernel not configured for shared memory\n"
msgstr "Kernel non configuré pour la mémoire partagée\n"
-#: sys-utils/ipcs.c:274
+#: sys-utils/ipcs.c:273
msgid "------ Shared Memory Limits --------\n"
msgstr "------ Limites de la mémoire partagée --------\n"
#. glibc 2.1.3 and all earlier libc's have ints as fields
#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
-#: sys-utils/ipcs.c:279
+#: sys-utils/ipcs.c:278
#, fuzzy, c-format
msgid "max number of segments = %ld\n"
msgstr "Nombre max de segments = %d\n"
-#: sys-utils/ipcs.c:281
+#: sys-utils/ipcs.c:280
#, fuzzy, c-format
msgid "max seg size (kbytes) = %ld\n"
msgstr "Taille max de segment (kilo-octets) = %d\n"
-#: sys-utils/ipcs.c:283
+#: sys-utils/ipcs.c:282
#, fuzzy, c-format
msgid "max total shared memory (kbytes) = %ld\n"
msgstr "Total max de la mémoire partagée (kilo-octets) = %d\n"
-#: sys-utils/ipcs.c:285
+#: sys-utils/ipcs.c:284
#, fuzzy, c-format
msgid "min seg size (bytes) = %ld\n"
msgstr "Taille min de segment (octets) = %d\n"
-#: sys-utils/ipcs.c:290
+#: sys-utils/ipcs.c:289
msgid "------ Shared Memory Status --------\n"
msgstr "------ Statut de la mémoire partagée --------\n"
-#: sys-utils/ipcs.c:291
+#: sys-utils/ipcs.c:290
#, c-format
msgid "segments allocated %d\n"
msgstr "Segments alloués %d\n"
-#: sys-utils/ipcs.c:292
+#: sys-utils/ipcs.c:291
#, c-format
msgid "pages allocated %ld\n"
msgstr "Pages allouées %ld\n"
-#: sys-utils/ipcs.c:293
+#: sys-utils/ipcs.c:292
#, c-format
msgid "pages resident %ld\n"
msgstr "Pages résidentes %ld\n"
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:293
#, c-format
msgid "pages swapped %ld\n"
msgstr "Pages échangées %ld\n"
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:294
#, c-format
msgid "Swap performance: %ld attempts\t %ld successes\n"
msgstr "Performances d'échange : %ld tentatives\t %ld succès\n"
-#: sys-utils/ipcs.c:300
+#: sys-utils/ipcs.c:299
msgid "------ Shared Memory Segment Creators/Owners --------\n"
msgstr ""
"------ Créateurs/Propriétaires de segments en mémoire partagée --------\n"
-#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:300 sys-utils/ipcs.c:417 sys-utils/ipcs.c:516
#, fuzzy, c-format
msgid "%-10s %-10s %-10s %-10s %-10s %-10s\n"
msgstr "%-10s%-10s%-10s%-10s%-10s%-10s\n"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:308 sys-utils/ipcs.c:315
-#: sys-utils/ipcs.c:321 sys-utils/ipcs.c:425
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:307 sys-utils/ipcs.c:314
+#: sys-utils/ipcs.c:320 sys-utils/ipcs.c:424
msgid "shmid"
msgstr "shmid"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:321 sys-utils/ipcs.c:419
-#: sys-utils/ipcs.c:434 sys-utils/ipcs.c:519 sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:320 sys-utils/ipcs.c:418
+#: sys-utils/ipcs.c:433 sys-utils/ipcs.c:517 sys-utils/ipcs.c:535
msgid "perms"
msgstr "perms"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:517
msgid "cuid"
msgstr "cuid"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:517
msgid "cgid"
msgstr "cgid"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:517
msgid "uid"
msgstr "uid"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:517
msgid "gid"
msgstr "gid"
-#: sys-utils/ipcs.c:306
+#: sys-utils/ipcs.c:305
msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
msgstr ""
"------ Heures d'attachement/détachement/modification de mémoire partagée "
"--------\n"
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:306
#, fuzzy, c-format
msgid "%-10s %-10s %-20s %-20s %-20s\n"
msgstr "%-10s%-10s %-20s%-20s%-20s\n"
-#: sys-utils/ipcs.c:308 sys-utils/ipcs.c:315 sys-utils/ipcs.c:321
-#: sys-utils/ipcs.c:425 sys-utils/ipcs.c:434 sys-utils/ipcs.c:525
-#: sys-utils/ipcs.c:531 sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:314 sys-utils/ipcs.c:320
+#: sys-utils/ipcs.c:424 sys-utils/ipcs.c:433 sys-utils/ipcs.c:523
+#: sys-utils/ipcs.c:529 sys-utils/ipcs.c:535
msgid "owner"
msgstr "propriétaire"
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:307
msgid "attached"
msgstr "attaché"
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:307
msgid "detached"
msgstr "détaché"
-#: sys-utils/ipcs.c:309
+#: sys-utils/ipcs.c:308
msgid "changed"
msgstr "changé"
-#: sys-utils/ipcs.c:313
+#: sys-utils/ipcs.c:312
msgid "------ Shared Memory Creator/Last-op --------\n"
msgstr "------ Créateur/Dernier opérateur en mémoire partagée --------\n"
-#: sys-utils/ipcs.c:314 sys-utils/ipcs.c:530
+#: sys-utils/ipcs.c:313 sys-utils/ipcs.c:528
#, fuzzy, c-format
msgid "%-10s %-10s %-10s %-10s\n"
msgstr "%-10s%-10s%-10s%-10s\n"
-#: sys-utils/ipcs.c:315
+#: sys-utils/ipcs.c:314
msgid "cpid"
msgstr "cpid"
-#: sys-utils/ipcs.c:315
+#: sys-utils/ipcs.c:314
msgid "lpid"
msgstr "lpid"
-#: sys-utils/ipcs.c:319
+#: sys-utils/ipcs.c:318
msgid "------ Shared Memory Segments --------\n"
msgstr "------ Segments de mémoire partagée --------\n"
-#: sys-utils/ipcs.c:320
+#: sys-utils/ipcs.c:319
#, fuzzy, c-format
msgid "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n"
msgstr "%-10s%-10s%-10s%-10s%-10s%-10s%-12s\n"
-#: sys-utils/ipcs.c:321 sys-utils/ipcs.c:434 sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:320 sys-utils/ipcs.c:433 sys-utils/ipcs.c:535
msgid "key"
msgstr "touche"
-#: sys-utils/ipcs.c:321
+#: sys-utils/ipcs.c:320
msgid "bytes"
msgstr "octets"
-#: sys-utils/ipcs.c:322
+#: sys-utils/ipcs.c:321
msgid "nattch"
msgstr "nattch"
-#: sys-utils/ipcs.c:322 sys-utils/ipcs.c:435
+#: sys-utils/ipcs.c:321
msgid "status"
msgstr "statut"
-#: sys-utils/ipcs.c:343 sys-utils/ipcs.c:345 sys-utils/ipcs.c:347
-#: sys-utils/ipcs.c:456 sys-utils/ipcs.c:458 sys-utils/ipcs.c:558
-#: sys-utils/ipcs.c:560 sys-utils/ipcs.c:562 sys-utils/ipcs.c:615
-#: sys-utils/ipcs.c:617 sys-utils/ipcs.c:646 sys-utils/ipcs.c:648
-#: sys-utils/ipcs.c:650 sys-utils/ipcs.c:674
+#: sys-utils/ipcs.c:342 sys-utils/ipcs.c:344 sys-utils/ipcs.c:346
+#: sys-utils/ipcs.c:455 sys-utils/ipcs.c:457 sys-utils/ipcs.c:556
+#: sys-utils/ipcs.c:558 sys-utils/ipcs.c:560 sys-utils/ipcs.c:613
+#: sys-utils/ipcs.c:615 sys-utils/ipcs.c:644 sys-utils/ipcs.c:646
+#: sys-utils/ipcs.c:648 sys-utils/ipcs.c:672
msgid "Not set"
msgstr "Non défini"
-#: sys-utils/ipcs.c:372
+#: sys-utils/ipcs.c:371
msgid "dest"
msgstr "dest"
-#: sys-utils/ipcs.c:373
+#: sys-utils/ipcs.c:372
msgid "locked"
msgstr "verrouillé"
-#: sys-utils/ipcs.c:393
+#: sys-utils/ipcs.c:392
msgid "kernel not configured for semaphores\n"
msgstr "Kernel non configuré pour les sémaphores\n"
-#: sys-utils/ipcs.c:399
+#: sys-utils/ipcs.c:398
msgid "------ Semaphore Limits --------\n"
msgstr "------ Limites des sémaphores --------\n"
-#: sys-utils/ipcs.c:403
+#: sys-utils/ipcs.c:402
#, c-format
msgid "max number of arrays = %d\n"
msgstr "Nombre max de tables = %d\n"
-#: sys-utils/ipcs.c:404
+#: sys-utils/ipcs.c:403
#, c-format
msgid "max semaphores per array = %d\n"
msgstr "Sémaphores max par table = %d\n"
-#: sys-utils/ipcs.c:405
+#: sys-utils/ipcs.c:404
#, c-format
msgid "max semaphores system wide = %d\n"
msgstr "Nombre max de sémaphores dans le système = %d\n"
-#: sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:405
#, c-format
msgid "max ops per semop call = %d\n"
msgstr "Opérateurs max par appel semop = %d\n"
-#: sys-utils/ipcs.c:407
+#: sys-utils/ipcs.c:406
#, c-format
msgid "semaphore max value = %d\n"
msgstr "Valeur max de sémaphores = %d\n"
-#: sys-utils/ipcs.c:411
+#: sys-utils/ipcs.c:410
msgid "------ Semaphore Status --------\n"
msgstr "------ Statut des sémaphores --------\n"
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:411
#, c-format
msgid "used arrays = %d\n"
msgstr "Tables utilisées = %d\n"
-#: sys-utils/ipcs.c:413
+#: sys-utils/ipcs.c:412
#, c-format
msgid "allocated semaphores = %d\n"
msgstr "Sémaphores alloués = %d\n"
-#: sys-utils/ipcs.c:417
+#: sys-utils/ipcs.c:416
msgid "------ Semaphore Arrays Creators/Owners --------\n"
msgstr "------ Créateurs/Propriétaires de tables de sémaphores --------\n"
-#: sys-utils/ipcs.c:419 sys-utils/ipcs.c:434
+#: sys-utils/ipcs.c:418 sys-utils/ipcs.c:433
msgid "semid"
msgstr "semid"
-#: sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:422
msgid "------ Shared Memory Operation/Change Times --------\n"
msgstr "------ Heures d'opération/modification en mémoire partagée --------\n"
-#: sys-utils/ipcs.c:424
+#: sys-utils/ipcs.c:423
#, fuzzy, c-format
msgid "%-8s %-10s %-26.24s %-26.24s\n"
msgstr "%-8s%-10s %-26.24s %-26.24s\n"
-#: sys-utils/ipcs.c:425
+#: sys-utils/ipcs.c:424
msgid "last-op"
msgstr "Dernier opérateur"
-#: sys-utils/ipcs.c:425
+#: sys-utils/ipcs.c:424
msgid "last-changed"
msgstr "Dernière modification"
-#: sys-utils/ipcs.c:432
+#: sys-utils/ipcs.c:431
msgid "------ Semaphore Arrays --------\n"
msgstr "------ Tables de sémaphores --------\n"
-#: sys-utils/ipcs.c:433
+#: sys-utils/ipcs.c:432 sys-utils/ipcs.c:675
#, fuzzy, c-format
-msgid "%-10s %-10s %-10s %-10s %-10s %-12s\n"
-msgstr "%-10s%-10s%-10s%-10s%-10s%-12s\n"
+msgid "%-10s %-10s %-10s %-10s %-10s\n"
+msgstr "%-10s%-10s%-10s%-10s%-10s\n"
-#: sys-utils/ipcs.c:435
+#: sys-utils/ipcs.c:434
msgid "nsems"
msgstr "nsems"
-#: sys-utils/ipcs.c:495
+#: sys-utils/ipcs.c:493
#, fuzzy
msgid "kernel not configured for message queues\n"
msgstr "Kernel non configuré pour les sémaphores\n"
-#: sys-utils/ipcs.c:503
+#: sys-utils/ipcs.c:501
msgid "------ Messages: Limits --------\n"
msgstr "------ Messages : Limites --------\n"
-#: sys-utils/ipcs.c:504
+#: sys-utils/ipcs.c:502
#, c-format
msgid "max queues system wide = %d\n"
msgstr "Files d'attente max dans le système = %d\n"
-#: sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:503
#, c-format
msgid "max size of message (bytes) = %d\n"
msgstr "Taille de message max (octets) = %d\n"
-#: sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:504
#, c-format
msgid "default max size of queue (bytes) = %d\n"
msgstr "Taille de la file max par défaut (octets) = %d\n"
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:508
msgid "------ Messages: Status --------\n"
msgstr "------ Messages : Statut --------\n"
-#: sys-utils/ipcs.c:511
+#: sys-utils/ipcs.c:509
#, c-format
msgid "allocated queues = %d\n"
msgstr "Files d'attente allouées = %d\n"
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:510
#, c-format
msgid "used headers = %d\n"
msgstr "En-têtes utilisés = %d\n"
-#: sys-utils/ipcs.c:513
+#: sys-utils/ipcs.c:511
#, c-format
msgid "used space = %d bytes\n"
msgstr "Espace utilisé = %d octets\n"
-#: sys-utils/ipcs.c:517
+#: sys-utils/ipcs.c:515
msgid "------ Message Queues: Creators/Owners --------\n"
msgstr ""
"------ Files d'attente de messages : Créateurs/Propriétaires --------\n"
-#: sys-utils/ipcs.c:519 sys-utils/ipcs.c:525 sys-utils/ipcs.c:531
-#: sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:517 sys-utils/ipcs.c:523 sys-utils/ipcs.c:529
+#: sys-utils/ipcs.c:535
msgid "msqid"
msgstr "msqid"
-#: sys-utils/ipcs.c:523
+#: sys-utils/ipcs.c:521
msgid "------ Message Queues Send/Recv/Change Times --------\n"
msgstr ""
"------ Heures d'envoi/réception/modification des files d'attente de messages "
"--------\n"
-#: sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:522
#, fuzzy, c-format
msgid "%-8s %-10s %-20s %-20s %-20s\n"
msgstr "%-8s%-10s %-20s%-20s%-20s\n"
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:523
msgid "send"
msgstr "envoi"
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:523
msgid "recv"
msgstr "réception"
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:523
msgid "change"
msgstr "modification"
-#: sys-utils/ipcs.c:529
+#: sys-utils/ipcs.c:527
msgid "------ Message Queues PIDs --------\n"
msgstr "------ PID de files d'attente de messages --------\n"
-#: sys-utils/ipcs.c:531
+#: sys-utils/ipcs.c:529
msgid "lspid"
msgstr "lspid"
-#: sys-utils/ipcs.c:531
+#: sys-utils/ipcs.c:529
msgid "lrpid"
msgstr "lrpid"
-#: sys-utils/ipcs.c:535
+#: sys-utils/ipcs.c:533
msgid "------ Message Queues --------\n"
msgstr "------ Files d'attente de messages --------\n"
-#: sys-utils/ipcs.c:536
+#: sys-utils/ipcs.c:534
#, fuzzy, c-format
msgid "%-10s %-10s %-10s %-10s %-12s %-12s\n"
msgstr "%-10s%-10s%-10s%-10s%-12s%-12s\n"
-#: sys-utils/ipcs.c:538
+#: sys-utils/ipcs.c:536
msgid "used-bytes"
msgstr "octets utilisés"
-#: sys-utils/ipcs.c:538
+#: sys-utils/ipcs.c:536
msgid "messages"
msgstr "messages"
-#: sys-utils/ipcs.c:606
+#: sys-utils/ipcs.c:604
#, c-format
msgid ""
"\n"
@@ -8887,37 +9108,37 @@ msgstr ""
"\n"
"shmid de segments de mémoire partagée =%d\n"
-#: sys-utils/ipcs.c:607
+#: sys-utils/ipcs.c:605
#, c-format
msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
-#: sys-utils/ipcs.c:609
+#: sys-utils/ipcs.c:607
#, c-format
msgid "mode=%#o\taccess_perms=%#o\n"
msgstr "mode=%#o\taccess_perms=%#o\n"
-#: sys-utils/ipcs.c:611
+#: sys-utils/ipcs.c:609
#, fuzzy, c-format
msgid "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n"
msgstr "octets=%d\tlpid=%d\tcpid=%d\tnattch=%d\n"
-#: sys-utils/ipcs.c:614
+#: sys-utils/ipcs.c:612
#, fuzzy, c-format
msgid "att_time=%-26.24s\n"
msgstr "att_time=%s"
-#: sys-utils/ipcs.c:616
+#: sys-utils/ipcs.c:614
#, fuzzy, c-format
msgid "det_time=%-26.24s\n"
msgstr "det_time=%s"
-#: sys-utils/ipcs.c:618 sys-utils/ipcs.c:649
+#: sys-utils/ipcs.c:616 sys-utils/ipcs.c:647
#, fuzzy, c-format
msgid "change_time=%-26.24s\n"
msgstr "change_time=%s"
-#: sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:631
#, c-format
msgid ""
"\n"
@@ -8926,27 +9147,27 @@ msgstr ""
"\n"
"msqid de file de messages=%d\n"
-#: sys-utils/ipcs.c:634
+#: sys-utils/ipcs.c:632
#, c-format
msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
-#: sys-utils/ipcs.c:636
+#: sys-utils/ipcs.c:634
#, fuzzy, c-format
msgid "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
msgstr "cbytes=%d\tqbytes=%d\tqnum=%d\tlspid=%d\tlrpid=%d\n"
-#: sys-utils/ipcs.c:645
+#: sys-utils/ipcs.c:643
#, fuzzy, c-format
msgid "send_time=%-26.24s\n"
msgstr "det_time=%s"
-#: sys-utils/ipcs.c:647
+#: sys-utils/ipcs.c:645
#, c-format
msgid "rcv_time=%-26.24s\n"
msgstr ""
-#: sys-utils/ipcs.c:667
+#: sys-utils/ipcs.c:665
#, c-format
msgid ""
"\n"
@@ -8955,53 +9176,48 @@ msgstr ""
"\n"
"semid de table de sémaphores=%d\n"
-#: sys-utils/ipcs.c:668
+#: sys-utils/ipcs.c:666
#, c-format
msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
msgstr "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
-#: sys-utils/ipcs.c:670
+#: sys-utils/ipcs.c:668
#, c-format
msgid "mode=%#o, access_perms=%#o\n"
msgstr "mode=%#o, access_perms=%#o\n"
-#: sys-utils/ipcs.c:672
+#: sys-utils/ipcs.c:670
#, fuzzy, c-format
msgid "nsems = %ld\n"
msgstr "nsems = %d\n"
-#: sys-utils/ipcs.c:673
+#: sys-utils/ipcs.c:671
#, fuzzy, c-format
msgid "otime = %-26.24s\n"
msgstr "otime = %s"
-#: sys-utils/ipcs.c:675
+#: sys-utils/ipcs.c:673
#, fuzzy, c-format
msgid "ctime = %-26.24s\n"
msgstr "ctime = %s"
-#: sys-utils/ipcs.c:677
-#, fuzzy, c-format
-msgid "%-10s %-10s %-10s %-10s %-10s\n"
-msgstr "%-10s%-10s%-10s%-10s%-10s\n"
-
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "semnum"
msgstr "semnum"
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "value"
msgstr "valeur"
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "ncount"
msgstr "ncount"
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "zcount"
msgstr "zcount"
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "pid"
msgstr "pid"
@@ -9257,11 +9473,11 @@ msgstr "-- ligne déjà vidée sur disque"
msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
msgstr "Usage : %s [ - ] [ -2 ] [ fichier ... ]\n"
-#: text-utils/column.c:298
+#: text-utils/column.c:297
msgid "line too long"
msgstr "ligne trop longue"
-#: text-utils/column.c:375
+#: text-utils/column.c:374
msgid "usage: column [-tx] [-c columns] [file ...]\n"
msgstr "Usage : column [-tx] [-c colonnes] [fichier ...]\n"
@@ -9355,33 +9571,33 @@ msgstr ""
msgid "Can't open help file"
msgstr "Impossible d'ouvrir le fichier d'aide"
-#: text-utils/more.c:1442 text-utils/more.c:1446
+#: text-utils/more.c:1442 text-utils/more.c:1447
msgid "[Press 'h' for instructions.]"
msgstr "[Appuyez sur 'h' pour l'aide.]"
-#: text-utils/more.c:1480
+#: text-utils/more.c:1481
#, c-format
msgid "\"%s\" line %d"
msgstr "\"%s\" ligne %d"
-#: text-utils/more.c:1482
+#: text-utils/more.c:1483
#, c-format
msgid "[Not a file] line %d"
msgstr "[Pas un fichier] ligne %d"
-#: text-utils/more.c:1566
+#: text-utils/more.c:1567
msgid " Overflow\n"
msgstr " Dépassement\n"
-#: text-utils/more.c:1613
+#: text-utils/more.c:1614
msgid "...skipping\n"
msgstr "...saut\n"
-#: text-utils/more.c:1643
+#: text-utils/more.c:1644
msgid "Regular expression botch"
msgstr "expression régulière botch"
-#: text-utils/more.c:1655
+#: text-utils/more.c:1656
msgid ""
"\n"
"Pattern not found\n"
@@ -9389,15 +9605,15 @@ msgstr ""
"\n"
"Motif introuvable\n"
-#: text-utils/more.c:1658
+#: text-utils/more.c:1659 text-utils/pg.c:1134 text-utils/pg.c:1285
msgid "Pattern not found"
msgstr "Motif introuvable"
-#: text-utils/more.c:1719
+#: text-utils/more.c:1720
msgid "can't fork\n"
msgstr "Fork impossible\n"
-#: text-utils/more.c:1758
+#: text-utils/more.c:1759
msgid ""
"\n"
"...Skipping "
@@ -9405,21 +9621,21 @@ msgstr ""
"\n"
"...Saut "
-#: text-utils/more.c:1763
+#: text-utils/more.c:1764
#, fuzzy
msgid "...Skipping to file "
msgstr "...Saut "
-#: text-utils/more.c:1765
+#: text-utils/more.c:1766
#, fuzzy
msgid "...Skipping back to file "
msgstr "retour au fichier "
-#: text-utils/more.c:2046
+#: text-utils/more.c:2047
msgid "Line too long"
msgstr "Ligne trop longue"
-#: text-utils/more.c:2089
+#: text-utils/more.c:2090
msgid "No previous command to substitute for"
msgstr "Aucune commande antérieure à substituer"
@@ -9472,6 +9688,102 @@ msgstr "hexdump : format incorrect {%s}\n"
msgid "hexdump: bad conversion character %%%s.\n"
msgstr "hexdump : caractère de conversion incorrect %%%s.\n"
+#: text-utils/pg.c:246
+#, c-format
+msgid ""
+"%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
+msgstr ""
+
+#: text-utils/pg.c:255
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- %s\n"
+msgstr "l'option `%s' requiert un argument\n"
+
+#: text-utils/pg.c:263
+#, fuzzy, c-format
+msgid "%s: illegal option -- %s\n"
+msgstr "Touche non valide"
+
+#: text-utils/pg.c:380
+#, fuzzy
+msgid "...skipping forward\n"
+msgstr "...saut\n"
+
+#: text-utils/pg.c:382
+#, fuzzy
+msgid "...skipping backward\n"
+msgstr "...saut\n"
+
+#: text-utils/pg.c:404
+#, fuzzy
+msgid "No next file"
+msgstr "(Fichier suivant : %s)"
+
+#: text-utils/pg.c:408
+#, fuzzy
+msgid "No previous file"
+msgstr "Aucune partition définie\n"
+
+#: text-utils/pg.c:938
+#, fuzzy, c-format
+msgid "%s: Read error from %s file\n"
+msgstr "Erreur d'écriture sur %s\n"
+
+#.
+#. * Most likely '\0' in input.
+#.
+#: text-utils/pg.c:944
+#, c-format
+msgid "%s: Unexpected EOF in %s file\n"
+msgstr ""
+
+#: text-utils/pg.c:947
+#, fuzzy, c-format
+msgid "%s: Unknown error in %s file\n"
+msgstr "Erreur d'écriture sur %s\n"
+
+#: text-utils/pg.c:1042
+#, fuzzy, c-format
+msgid "%s: Cannot create tempfile\n"
+msgstr "%s : lecture du fichier temporaire impossible.\n"
+
+#: text-utils/pg.c:1051 text-utils/pg.c:1226
+#, fuzzy
+msgid "RE error: "
+msgstr ", erreur"
+
+#: text-utils/pg.c:1208
+msgid "(EOF)"
+msgstr ""
+
+#: text-utils/pg.c:1234
+msgid "No remembered search string"
+msgstr ""
+
+#: text-utils/pg.c:1317
+#, fuzzy
+msgid "Cannot open "
+msgstr "Impossible d'ouvrir %s\n"
+
+#: text-utils/pg.c:1365
+#, fuzzy
+msgid "saved"
+msgstr "envoi"
+
+#: text-utils/pg.c:1472
+msgid ": !command not allowed in rflag mode.\n"
+msgstr ""
+
+#: text-utils/pg.c:1504
+#, fuzzy
+msgid "fork() failed, try again later\n"
+msgstr "Mot de passe *NON* changé. Essayez de nouveau plus tard.\n"
+
+#: text-utils/pg.c:1709
+#, fuzzy
+msgid "(Next file: "
+msgstr "(Fichier suivant : %s)"
+
#: text-utils/rev.c:113
msgid "Unable to allocate bufferspace\n"
msgstr "Impossible d'allouer de l'espace pour le tampon\n"
@@ -9506,6 +9818,28 @@ msgstr "Ligne en entrée trop longue.\n"
msgid "Out of memory when growing buffer.\n"
msgstr "Mémoire insuffisante pour accroître le tampon.\n"
+#~ msgid "invalid number `%s'\n"
+#~ msgstr "nombre invalide `%s'\n"
+
+#~ msgid "number `%s' to `%s' out of range\n"
+#~ msgstr "nombre de `%s' à `%s' hors plage\n"
+
+#~ msgid "unrecognized option `%s'\n"
+#~ msgstr "option non reconnue `%s'\n"
+
+#~ msgid "option `%s' requires an argument\n"
+#~ msgstr "l'option `%s' requiert un argument\n"
+
+#~ msgid "option `%s' doesn't allow an argument\n"
+#~ msgstr "l'option `%s' n'autorise pas d'argument\n"
+
+#~ msgid "unrecognized option `-%c'\n"
+#~ msgstr "option non reconnue `-%c'\n"
+
+#, fuzzy
+#~ msgid "%-10s %-10s %-10s %-10s %-10s %-12s\n"
+#~ msgstr "%-10s%-10s%-10s%-10s%-10s%-12s\n"
+
#~ msgid "umount: only %s can unmount %s from %s"
#~ msgstr "umount : seul %s peut démonter %s de %s."
@@ -9691,9 +10025,6 @@ msgstr "Mémoire insuffisante pour accroître le tampon.\n"
#~ msgid "not mounted anything"
#~ msgstr "Pas de montage"
-#~ msgid "Not set\n"
-#~ msgstr "Non défini\n"
-
#~ msgid "send_time=%srcv_time=%schange_time=%s"
#~ msgstr "send_time=%srcv_time=%schange_time=%s"
diff --git a/po/it.po b/po/it.po
index b72719c17..532ee02cf 100644
--- a/po/it.po
+++ b/po/it.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: util-linux 2.10f\n"
-"POT-Creation-Date: 2002-05-09 02:51+0200\n"
+"POT-Creation-Date: 2002-07-07 17:03+0200\n"
"PO-Revision-Date: 2000-04-04 21:52-0800\n"
"Last-Translator: Beth Powell <bpowell@turbolinux.com>\n"
"Language-Team: <support@turbolinux.com>\n"
@@ -111,28 +111,28 @@ msgstr ""
msgid "usage:\n"
msgstr "Utilizzo:"
-#: disk-utils/fdformat.c:35
+#: disk-utils/fdformat.c:31
msgid "Formatting ... "
msgstr "Formattazione in corso ... "
-#: disk-utils/fdformat.c:53 disk-utils/fdformat.c:88
+#: disk-utils/fdformat.c:49 disk-utils/fdformat.c:84
msgid "done\n"
msgstr "fatto\n"
-#: disk-utils/fdformat.c:64
+#: disk-utils/fdformat.c:60
msgid "Verifying ... "
msgstr "Verifica in corso ... "
-#: disk-utils/fdformat.c:75
+#: disk-utils/fdformat.c:71
msgid "Read: "
msgstr "Leggere: "
-#: disk-utils/fdformat.c:77
+#: disk-utils/fdformat.c:73
#, c-format
msgid "Problem reading cylinder %d, expected %d, read %d\n"
msgstr "Problema durante la lettura del cilindro %d, %d previsto, lettura %d\n"
-#: disk-utils/fdformat.c:83
+#: disk-utils/fdformat.c:79
#, c-format
msgid ""
"bad data in cyl %d\n"
@@ -141,42 +141,148 @@ msgstr ""
"dati danneggiati nel cil %d\n"
"Continua ... "
-#: disk-utils/fdformat.c:98
+#: disk-utils/fdformat.c:94
#, c-format
msgid "usage: %s [ -n ] device\n"
msgstr "utilizzo: dispositivo %s [ -n ]\n"
-#: disk-utils/fdformat.c:120 disk-utils/fsck.minix.c:1291
+#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1291
#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:55
-#: disk-utils/mkfs.minix.c:644 disk-utils/mkswap.c:457
-#: disk-utils/setfdprm.c:128 misc-utils/cal.c:246 misc-utils/ddate.c:181
-#: misc-utils/kill.c:188 misc-utils/rename.c:79 misc-utils/script.c:132
+#: disk-utils/mkfs.cramfs.c:665 disk-utils/mkfs.minix.c:644
+#: disk-utils/mkswap.c:457 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1170
+#: misc-utils/cal.c:246 misc-utils/ddate.c:181 misc-utils/kill.c:188
+#: misc-utils/rename.c:79 misc-utils/script.c:132
#, c-format
msgid "%s from %s\n"
msgstr "%s da %s\n"
-#: disk-utils/fdformat.c:134
-#, c-format
-msgid "%s: not a floppy device\n"
+#: disk-utils/fdformat.c:130
+#, fuzzy, c-format
+msgid "%s: not a block device\n"
msgstr "%s: non si tratta di un dispositivo floppy\n"
-#: disk-utils/fdformat.c:143
+#: disk-utils/fdformat.c:140
msgid "Could not determine current format type"
msgstr "Impossibile determinare il tipo di formato attuale"
-#: disk-utils/fdformat.c:144
+#: disk-utils/fdformat.c:141
#, c-format
msgid "%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n"
msgstr "%s-completo, tracce %d , %d sec/traccia. Capacità totale %d kB.\n"
-#: disk-utils/fdformat.c:145
+#: disk-utils/fdformat.c:142
msgid "Double"
msgstr "Doppio"
-#: disk-utils/fdformat.c:145
+#: disk-utils/fdformat.c:142
msgid "Single"
msgstr "Singolo"
+#: disk-utils/fsck.cramfs.c:98
+#, c-format
+msgid ""
+"usage: %s [-hv] [-x dir] file\n"
+" -h print this help\n"
+" -x dir extract into dir\n"
+" -v be more verbose\n"
+" file file to test\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:191
+#, c-format
+msgid "%s: error %d while decompressing! %p(%d)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:243
+#, fuzzy, c-format
+msgid "%s: size error in symlink `%s'\n"
+msgstr "errore di scrittura su %s\n"
+
+#: disk-utils/fsck.cramfs.c:258 disk-utils/fsck.cramfs.c:328
+#, c-format
+msgid " uncompressing block at %ld to %ld (%ld)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:287
+#, c-format
+msgid "%s: bogus mode on `%s' (%o)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:319
+#, fuzzy, c-format
+msgid " hole at %ld (%d)\n"
+msgstr "dovrebbe essere (%d, %d, %d)\n"
+
+#: disk-utils/fsck.cramfs.c:337
+#, c-format
+msgid "%s: Non-block (%ld) bytes\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:343
+#, c-format
+msgid "%s: Non-size (%ld vs %ld) bytes\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:392
+#, c-format
+msgid "%s: invalid cramfs--bad path length\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:472
+#, fuzzy, c-format
+msgid "%s: compiled without -x support\n"
+msgstr "%s: non e' stato compilato con il supporto per minix v2\n"
+
+#: disk-utils/fsck.cramfs.c:498
+#, c-format
+msgid "%s: warning--unable to determine filesystem size \n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:508
+#, fuzzy, c-format
+msgid "%s is not a block device or file\n"
+msgstr "%s: non si tratta di un dispositivo floppy\n"
+
+#: disk-utils/fsck.cramfs.c:514 disk-utils/fsck.cramfs.c:549
+#, c-format
+msgid "%s: invalid cramfs--file length too short\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:541
+#, c-format
+msgid "%s: invalid cramfs--wrong magic\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:554
+#, c-format
+msgid "%s: warning--file length too long, padded image?\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:564
+#, c-format
+msgid "%s: invalid cramfs--crc error\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:570
+#, c-format
+msgid "%s: warning--old cramfs image, no CRC\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:592
+#, c-format
+msgid "%s: invalid cramfs--bad superblock\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:608
+#, c-format
+msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:616
+#, c-format
+msgid "%s: invalid cramfs--invalid file data offset\n"
+msgstr ""
+
#: disk-utils/fsck.minix.c:200
#, c-format
msgid "Usage: %s [-larvsmf] /dev/name\n"
@@ -643,7 +749,7 @@ msgstr ""
msgid "not enough space, need at least %lu blocks"
msgstr ""
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2057
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2069
#, c-format
msgid "Device: %s\n"
msgstr "Dispositivo: %s\n"
@@ -734,6 +840,130 @@ msgstr "%s: memoria esaurita!\n"
msgid "mkfs version %s (%s)\n"
msgstr "versione mkfs %s (%s)\n"
+#: disk-utils/mkfs.cramfs.c:49
+#, c-format
+msgid ""
+"usage: %s [-h] [-v] [-e edition] [-i file] [-n name] dirname outfile\n"
+" -h print this help\n"
+" -v be verbose\n"
+" -E make all warnings errors (non-zero exit status)\n"
+" -e edition set edition number (part of fsid)\n"
+" -i file insert a file image into the filesystem (requires >= 2.4.0)\n"
+" -n name set name of cramfs filesystem\n"
+" -p pad by %d bytes for boot code\n"
+" -s sort directory entries (old option, ignored)\n"
+" -z make explicit holes (requires >= 2.3.39)\n"
+" dirname root of the filesystem to be compressed\n"
+" outfile output file\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:213
+#, c-format
+msgid ""
+"Very long (%u bytes) filename `%s' found.\n"
+" Please increase MAX_INPUT_NAMELEN in mkcramfs.c and recompile. Exiting.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:371
+msgid "filesystem too big. Exiting.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:422
+msgid ""
+"Exceeded MAXENTRIES. Raise this value in mkcramfs.c and recompile. "
+"Exiting.\n"
+msgstr ""
+
+#. (I don't think this can happen with zlib.)
+#: disk-utils/mkfs.cramfs.c:520
+#, c-format
+msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:537
+#, c-format
+msgid "%6.2f%% (%+d bytes)\t%s\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:705
+#, c-format
+msgid ""
+"warning: guestimate of required size (upper bound) is %LdMB, but maximum "
+"image size is %uMB. We might die prematurely.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:747
+#, fuzzy, c-format
+msgid "Including: %s\n"
+msgstr "Numero non valido: %s\n"
+
+#: disk-utils/mkfs.cramfs.c:753
+#, c-format
+msgid "Directory data: %d bytes\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:761
+#, c-format
+msgid "Everything: %d kilobytes\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:766
+#, fuzzy, c-format
+msgid "Super block: %d bytes\n"
+msgstr "spazio utilizzato = %d byte\n"
+
+#: disk-utils/mkfs.cramfs.c:773
+#, c-format
+msgid "CRC: %x\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:778
+#, c-format
+msgid "not enough space allocated for ROM image (%Ld allocated, %d used)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:790
+#, c-format
+msgid "ROM image write failed (%d %d)\n"
+msgstr ""
+
+#. (These warnings used to come at the start, but they scroll off the
+#. screen too quickly.)
+#. (can't happen when reading from ext2fs)
+#. bytes, not chars: think UTF8.
+#: disk-utils/mkfs.cramfs.c:799
+#, fuzzy
+msgid "warning: filenames truncated to 255 bytes.\n"
+msgstr "Attenzione: conteggio inode troppo grande.\n"
+
+#: disk-utils/mkfs.cramfs.c:802
+msgid "warning: files were skipped due to errors.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:805
+#, c-format
+msgid "warning: file sizes truncated to %luMB (minus 1 byte).\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:810
+#, c-format
+msgid ""
+"warning: uids truncated to %u bits. (This may be a security concern.)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:815
+#, c-format
+msgid ""
+"warning: gids truncated to %u bits. (This may be a security concern.)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:820
+#, c-format
+msgid ""
+"WARNING: device numbers truncated to %u bits. This almost certainly means\n"
+"that some device files will be wrong.\n"
+msgstr ""
+
#: disk-utils/mkfs.minix.c:181
#, c-format
msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
@@ -880,7 +1110,7 @@ msgid "too many bad pages"
msgstr "troppe pagine danneggiate"
#: disk-utils/mkswap.c:359 misc-utils/look.c:182 misc-utils/setterm.c:1130
-#: text-utils/more.c:2062 text-utils/more.c:2073
+#: text-utils/more.c:2063 text-utils/more.c:2074
msgid "Out of memory"
msgstr "Memoria esaurita"
@@ -1335,7 +1565,7 @@ msgstr " Logico"
#. odd flag on end
#. type id
#. type name
-#: fdisk/cfdisk.c:1996 fdisk/fdisk.c:1306 fdisk/fdisk.c:1594
+#: fdisk/cfdisk.c:1996 fdisk/fdisk.c:1318 fdisk/fdisk.c:1606
#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:690 fdisk/sfdisk.c:581
msgid "Unknown"
msgstr "Sconosciuto"
@@ -1891,7 +2121,7 @@ msgstr ""
" al numero di testine e di settori/traccia.\n"
"\n"
-#: fdisk/fdisk.c:194
+#: fdisk/fdisk.c:195
#, fuzzy
msgid ""
"Usage: fdisk [-b SSZ] [-u] DISK Change partition table\n"
@@ -1914,7 +2144,7 @@ msgstr ""
"-u: indica Inizio e Fine con unità di misura settore (invece di cilindro)\n"
"-b 2048: (per alcune unità MO) utilizzare i settori a 2048 byte\n"
-#: fdisk/fdisk.c:206
+#: fdisk/fdisk.c:207
msgid ""
"Usage: fdisk [-l] [-b SSZ] [-u] device\n"
"E.g.: fdisk /dev/hda (for the first IDE disk)\n"
@@ -1930,224 +2160,224 @@ msgstr ""
" o: fdisk /dev/rd/c0d0 o: fdisk /dev/ida/c0d0 (per i dispositivi RAID)\n"
" ...\n"
-#: fdisk/fdisk.c:215
+#: fdisk/fdisk.c:216
#, c-format
msgid "Unable to open %s\n"
msgstr "Impossibile aprire %s\n"
-#: fdisk/fdisk.c:219
+#: fdisk/fdisk.c:220
#, c-format
msgid "Unable to read %s\n"
msgstr "Impossibile leggere %s\n"
-#: fdisk/fdisk.c:223
+#: fdisk/fdisk.c:224
#, c-format
msgid "Unable to seek on %s\n"
msgstr "Ricerca impossibile su %s\n"
-#: fdisk/fdisk.c:227
+#: fdisk/fdisk.c:228
#, c-format
msgid "Unable to write %s\n"
msgstr "Impossibile scrivere su %s\n"
-#: fdisk/fdisk.c:231
+#: fdisk/fdisk.c:232
#, c-format
msgid "BLKGETSIZE ioctl failed on %s\n"
msgstr "BLKGETSIZE ioctl non riuscito su %s\n"
-#: fdisk/fdisk.c:235
+#: fdisk/fdisk.c:236
msgid "Unable to allocate any more memory\n"
msgstr "Impossibile allocare altra memoria\n"
-#: fdisk/fdisk.c:238
+#: fdisk/fdisk.c:239
msgid "Fatal error\n"
msgstr "Errore irreversibile\n"
-#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:359 fdisk/fdisk.c:366
-#: fdisk/fdisk.c:389 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:439
-#: fdisk/fdiskbsdlabel.c:124
+#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:360 fdisk/fdisk.c:367
+#: fdisk/fdisk.c:390 fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:440
+#: fdisk/fdiskbsdlabel.c:129
msgid "Command action"
msgstr "Azione comando"
-#: fdisk/fdisk.c:323
+#: fdisk/fdisk.c:324
msgid " a toggle a read only flag"
msgstr " a attivazione/disattivazione di un flag di sola lettura"
#. sun
-#: fdisk/fdisk.c:324 fdisk/fdisk.c:368
+#: fdisk/fdisk.c:325 fdisk/fdisk.c:369
msgid " b edit bsd disklabel"
msgstr " b modifica di bsd disklabel"
-#: fdisk/fdisk.c:325
+#: fdisk/fdisk.c:326
msgid " c toggle the mountable flag"
msgstr " c attivazione/disattivazione del flag montabile"
#. sun
-#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:370
+#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:371
msgid " d delete a partition"
msgstr " d cancellazione di una partizione"
-#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:371
+#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:372
msgid " l list known partition types"
msgstr " l elenco dei tipi di partizione conosciuti"
#. sun
-#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:360 fdisk/fdisk.c:372
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
-#: fdisk/fdiskbsdlabel.c:129
+#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:361 fdisk/fdisk.c:373
+#: fdisk/fdisk.c:398 fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
+#: fdisk/fdiskbsdlabel.c:134
msgid " m print this menu"
msgstr " m stampa di questo menu"
-#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
+#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374
msgid " n add a new partition"
msgstr " n aggiunta di una nuova partizione"
-#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:361 fdisk/fdisk.c:374
+#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:362 fdisk/fdisk.c:375
msgid " o create a new empty DOS partition table"
msgstr " o creazione di una nuova tabella delle partizioni DOS vuota"
-#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:375 fdisk/fdisk.c:398
-#: fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:376 fdisk/fdisk.c:399
+#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
msgid " p print the partition table"
msgstr " p stampa della tabella delle partizioni"
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:362 fdisk/fdisk.c:376
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
-#: fdisk/fdiskbsdlabel.c:132
+#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:363 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:450
+#: fdisk/fdiskbsdlabel.c:137
msgid " q quit without saving changes"
msgstr " q uscita senza salvataggio delle modifiche"
-#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:363 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:364 fdisk/fdisk.c:378
msgid " s create a new empty Sun disklabel"
msgstr " s creazione di una nuova disklabel Sun vuota"
#. sun
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
msgid " t change a partition's system id"
msgstr " t modifica dell'id di sistema di una partizione"
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
msgid " u change display/entry units"
msgstr " u modifica delle unità di visualizzazione/di immissione"
-#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380 fdisk/fdisk.c:402
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:452
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381 fdisk/fdisk.c:403
+#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
msgid " v verify the partition table"
msgstr " v verifica della tabella delle partizioni"
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381 fdisk/fdisk.c:403
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:382 fdisk/fdisk.c:404
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
msgid " w write table to disk and exit"
msgstr " w scrittura della tabella su disco e uscita"
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:383
msgid " x extra functionality (experts only)"
msgstr " x ulteriori funzioni (solo per esperti)"
-#: fdisk/fdisk.c:342
+#: fdisk/fdisk.c:343
msgid " a select bootable partition"
msgstr " a selezione della partizione che è possibile avviare"
#. sgi flavour
-#: fdisk/fdisk.c:343
+#: fdisk/fdisk.c:344
msgid " b edit bootfile entry"
msgstr " b modifica della voce bootfile"
#. sgi
-#: fdisk/fdisk.c:344
+#: fdisk/fdisk.c:345
msgid " c select sgi swap partition"
msgstr " c selezione della partizione swap sgi"
-#: fdisk/fdisk.c:367
+#: fdisk/fdisk.c:368
msgid " a toggle a bootable flag"
msgstr " a Cambia bootable flag"
-#: fdisk/fdisk.c:369
+#: fdisk/fdisk.c:370
msgid " c toggle the dos compatibility flag"
msgstr " c cambia il flag compatibile con il dos"
-#: fdisk/fdisk.c:390
+#: fdisk/fdisk.c:391
msgid " a change number of alternate cylinders"
msgstr " a modifica del numero di cilindri alternativi"
#. sun
-#: fdisk/fdisk.c:391 fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:441
+#: fdisk/fdisk.c:392 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
msgid " c change number of cylinders"
msgstr " c modifica del numero di cilindri"
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:393 fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:443
msgid " d print the raw data in the partition table"
msgstr " d stampa dei dati grezzi nella tabella delle partizioni"
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:394
msgid " e change number of extra sectors per cylinder"
msgstr " e modifica del numero dei settori supplementari per cilindro"
#. sun
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:395 fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
msgid " h change number of heads"
msgstr " h modifica del numero di testine"
-#: fdisk/fdisk.c:395
+#: fdisk/fdisk.c:396
msgid " i change interleave factor"
msgstr " i modifica del fattore di interleave"
#. sun
-#: fdisk/fdisk.c:396
+#: fdisk/fdisk.c:397
msgid " o change rotation speed (rpm)"
msgstr " o modifica della velocità di rotazione (rpm)"
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:450
-#: fdisk/fdiskbsdlabel.c:133
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:451
+#: fdisk/fdiskbsdlabel.c:138
msgid " r return to main menu"
msgstr " r ritorno al menu principale"
-#: fdisk/fdisk.c:401 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:452
msgid " s change number of sectors/track"
msgstr " s modifica del numero di settori/traccia"
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:405
msgid " y change number of physical cylinders"
msgstr " y modifica del numero di cilindri fisici"
-#: fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:440
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:441
msgid " b move beginning of data in a partition"
msgstr " b spostamento dell'inizio di dati in una partizione"
-#: fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:443
+#: fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:444
msgid " e list extended partitions"
msgstr " e elenco delle partizioni estese"
#. !sun
-#: fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
#, fuzzy
msgid " g create an IRIX (SGI) partition table"
msgstr " g creazione di una tabella delle partizioni IRIX"
#. !sun
-#: fdisk/fdisk.c:444
+#: fdisk/fdisk.c:445
#, fuzzy
msgid " f fix partition order"
msgstr " p stampa della tabella delle partizioni"
-#: fdisk/fdisk.c:561
+#: fdisk/fdisk.c:562
msgid "You must set"
msgstr "Si devono impostare"
-#: fdisk/fdisk.c:575
+#: fdisk/fdisk.c:576
msgid "heads"
msgstr "testine"
-#: fdisk/fdisk.c:577 fdisk/fdisk.c:1142 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:578 fdisk/fdisk.c:1154 fdisk/sfdisk.c:864
msgid "sectors"
msgstr "settori"
-#: fdisk/fdisk.c:579 fdisk/fdisk.c:1142 fdisk/fdiskbsdlabel.c:464
+#: fdisk/fdisk.c:580 fdisk/fdisk.c:1154 fdisk/fdiskbsdlabel.c:469
#: fdisk/sfdisk.c:864
msgid "cylinders"
msgstr "cilindri"
-#: fdisk/fdisk.c:583
+#: fdisk/fdisk.c:584
#, c-format
msgid ""
"%s%s.\n"
@@ -2157,11 +2387,11 @@ msgstr ""
"È possibile effettuare questa operazione dal menu delle funzioni "
"supplementari.\n"
-#: fdisk/fdisk.c:584
+#: fdisk/fdisk.c:585
msgid " and "
msgstr " e "
-#: fdisk/fdisk.c:601
+#: fdisk/fdisk.c:602
#, c-format
msgid ""
"\n"
@@ -2173,30 +2403,30 @@ msgid ""
" (e.g., DOS FDISK, OS/2 FDISK)\n"
msgstr ""
-#: fdisk/fdisk.c:624
+#: fdisk/fdisk.c:625
msgid "Bad offset in primary extended partition\n"
msgstr "Offset errato nella partizione estesa primaria\n"
-#: fdisk/fdisk.c:638
+#: fdisk/fdisk.c:639
#, c-format
msgid "Warning: deleting partitions after %d\n"
msgstr "Attenzione: cancellazione delle partizioni dopo %d\n"
-#: fdisk/fdisk.c:655
+#: fdisk/fdisk.c:656
#, c-format
msgid "Warning: extra link pointer in partition table %d\n"
msgstr ""
"Attenzione: puntatore di collegamento supplementare nella tabella delle "
"partizioni %d\n"
-#: fdisk/fdisk.c:663
+#: fdisk/fdisk.c:664
#, c-format
msgid "Warning: ignoring extra data in partition table %d\n"
msgstr ""
"Attenzione: i dati supplementari nella tabella delle partizioni %d vengono "
"ignorati\n"
-#: fdisk/fdisk.c:708
+#: fdisk/fdisk.c:709
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"
@@ -2208,16 +2438,22 @@ msgstr ""
"contenuto precedente non potrà essere recuperato.\n"
"\n"
-#: fdisk/fdisk.c:752
+#: fdisk/fdisk.c:753
#, c-format
msgid "Note: sector size is %d (not %d)\n"
msgstr "Nota: la dimensione del settore è %d (non %d)\n"
-#: fdisk/fdisk.c:870
+#: fdisk/fdisk.c:883
msgid "You will not be able to write the partition table.\n"
msgstr "Impossibile scrivere la tabella delle partizioni.\n"
-#: fdisk/fdisk.c:903
+#: fdisk/fdisk.c:914
+msgid ""
+"This disk has both DOS and BSD magic.\n"
+"Give the 'b' command to go to BSD mode.\n"
+msgstr ""
+
+#: fdisk/fdisk.c:924
#, fuzzy
msgid ""
"Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
@@ -2226,16 +2462,16 @@ msgstr ""
"Il dispositivo non contiene né una tabella delle partizioni DOS, né una "
"disklabel Sun o SGI valide\n"
-#: fdisk/fdisk.c:920
+#: fdisk/fdisk.c:942
msgid "Internal error\n"
msgstr "Errore interno\n"
-#: fdisk/fdisk.c:942
+#: fdisk/fdisk.c:954
#, c-format
msgid "Ignoring extra extended partition %d\n"
msgstr "La partizione estesa supplementare viene ignorata %d\n"
-#: fdisk/fdisk.c:954
+#: fdisk/fdisk.c:966
#, c-format
msgid ""
"Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2244,7 +2480,7 @@ msgstr ""
"Attenzione: il flag 0x%04x non valido della tabella delle partizioni %d "
"verrà corretto con w(rite)\n"
-#: fdisk/fdisk.c:976
+#: fdisk/fdisk.c:988
msgid ""
"\n"
"got EOF thrice - exiting..\n"
@@ -2252,65 +2488,65 @@ msgstr ""
"\n"
"ricevuto EOF tre volte - uscita in corso..\n"
-#: fdisk/fdisk.c:1015
+#: fdisk/fdisk.c:1027
msgid "Hex code (type L to list codes): "
msgstr "Codice esadecimale (digitare L per elencare i codici): "
-#: fdisk/fdisk.c:1054
+#: fdisk/fdisk.c:1066
#, c-format
msgid "%s (%d-%d, default %d): "
msgstr "%s (%d-%d, predefinito %d): "
-#: fdisk/fdisk.c:1110
+#: fdisk/fdisk.c:1122
#, c-format
msgid "Using default value %d\n"
msgstr "Utilizzo del valore predefinito %d\n"
-#: fdisk/fdisk.c:1114
+#: fdisk/fdisk.c:1126
msgid "Value out of range.\n"
msgstr "Valore fuori intervallo.\n"
-#: fdisk/fdisk.c:1124
+#: fdisk/fdisk.c:1136
msgid "Partition number"
msgstr "Numero della partizione"
-#: fdisk/fdisk.c:1133
+#: fdisk/fdisk.c:1145
#, c-format
msgid "Warning: partition %d has empty type\n"
msgstr "Attenzione: la partizione %d ha tipo vuoto\n"
-#: fdisk/fdisk.c:1140
+#: fdisk/fdisk.c:1152
msgid "cylinder"
msgstr "cilindro"
-#: fdisk/fdisk.c:1140
+#: fdisk/fdisk.c:1152
msgid "sector"
msgstr "settore"
-#: fdisk/fdisk.c:1149
+#: fdisk/fdisk.c:1161
#, c-format
msgid "Changing display/entry units to %s\n"
msgstr "Modifica delle unità di visualizzazione/immissione su %s\n"
-#: fdisk/fdisk.c:1160
+#: fdisk/fdisk.c:1172
#, c-format
msgid "WARNING: Partition %d is an extended partition\n"
msgstr "ATTENZIONE: la partizione %d è una partizione estesa\n"
-#: fdisk/fdisk.c:1171
+#: fdisk/fdisk.c:1183
msgid "DOS Compatibility flag is set\n"
msgstr "Impostato il flag compatibile con DOS\n"
-#: fdisk/fdisk.c:1175
+#: fdisk/fdisk.c:1187
msgid "DOS Compatibility flag is not set\n"
msgstr "Il flag compatibile con DOS non è impostato\n"
-#: fdisk/fdisk.c:1261
+#: fdisk/fdisk.c:1273
#, c-format
msgid "Partition %d does not exist yet!\n"
msgstr "La partizione %d non esiste ancora!\n"
-#: fdisk/fdisk.c:1266
+#: fdisk/fdisk.c:1278
msgid ""
"Type 0 means free space to many systems\n"
"(but not to Linux). Having partitions of\n"
@@ -2322,7 +2558,7 @@ msgstr ""
"tipo 0 probabilmente non è consigliabile. È possibile eliminare\n"
"una partizione utilizzando il comando `d'.\n"
-#: fdisk/fdisk.c:1275
+#: fdisk/fdisk.c:1287
msgid ""
"You cannot change a partition into an extended one or vice versa\n"
"Delete it first.\n"
@@ -2330,7 +2566,7 @@ msgstr ""
"Non è possibile trasformare una partizione in una estesa o viceversa\n"
"Prima bisogna eliminarla.\n"
-#: fdisk/fdisk.c:1284
+#: fdisk/fdisk.c:1296
msgid ""
"Consider leaving partition 3 as Whole disk (5),\n"
"as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2340,7 +2576,7 @@ msgstr ""
"poiché SunOS/Solaris lo prevede e ciò è gradito anche a Linux.\n"
"\n"
-#: fdisk/fdisk.c:1290
+#: fdisk/fdisk.c:1302
msgid ""
"Consider leaving partition 9 as volume header (0),\n"
"and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2350,53 +2586,53 @@ msgstr ""
"e la partizione 11 come volume intero (6) poiché IRIX lo prevede.\n"
"\n"
-#: fdisk/fdisk.c:1303
+#: fdisk/fdisk.c:1315
#, c-format
msgid "Changed system type of partition %d to %x (%s)\n"
msgstr "Modificato il tipo di sistema della partizione %d in %x (%s)\n"
-#: fdisk/fdisk.c:1357
+#: fdisk/fdisk.c:1369
#, c-format
msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
msgstr ""
"La partizione %d ha diversi elementi iniziali fisici/logici (non Linux?):\n"
-#: fdisk/fdisk.c:1359 fdisk/fdisk.c:1367 fdisk/fdisk.c:1376 fdisk/fdisk.c:1385
+#: fdisk/fdisk.c:1371 fdisk/fdisk.c:1379 fdisk/fdisk.c:1388 fdisk/fdisk.c:1397
#, c-format
msgid " phys=(%d, %d, %d) "
msgstr " phys=(%d, %d, %d) "
-#: fdisk/fdisk.c:1360 fdisk/fdisk.c:1368
+#: fdisk/fdisk.c:1372 fdisk/fdisk.c:1380
#, c-format
msgid "logical=(%d, %d, %d)\n"
msgstr "logico=(%d, %d, %d)\n"
-#: fdisk/fdisk.c:1365
+#: fdisk/fdisk.c:1377
#, c-format
msgid "Partition %d has different physical/logical endings:\n"
msgstr "La partizione %d ha diversi elementi finali fisici/logici:\n"
-#: fdisk/fdisk.c:1374
+#: fdisk/fdisk.c:1386
#, c-format
msgid "Partition %i does not start on cylinder boundary:\n"
msgstr "La partizione %i non inizia al limite del cilindro:\n"
-#: fdisk/fdisk.c:1377
+#: fdisk/fdisk.c:1389
#, c-format
msgid "should be (%d, %d, 1)\n"
msgstr "dovrebbe essere (%d, %d, 1)\n"
-#: fdisk/fdisk.c:1383
+#: fdisk/fdisk.c:1395
#, c-format
msgid "Partition %i does not end on cylinder boundary:\n"
msgstr "La partizione %i non termina al limite del cilindro:\n"
-#: fdisk/fdisk.c:1386
+#: fdisk/fdisk.c:1398
#, c-format
msgid "should be (%d, %d, %d)\n"
msgstr "dovrebbe essere (%d, %d, %d)\n"
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1405
#, c-format
msgid ""
"\n"
@@ -2409,29 +2645,29 @@ msgstr ""
"Unità = %s di %d * %d byte\n"
"\n"
-#: fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1513
msgid ""
"Nothing to do. Ordering is correct already.\n"
"\n"
msgstr ""
-#: fdisk/fdisk.c:1565
+#: fdisk/fdisk.c:1577
#, c-format
msgid "%*s Boot Start End Blocks Id System\n"
msgstr "%*s Avvio Inizio Fine Blocchi Id Sistema\n"
-#: fdisk/fdisk.c:1566 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:675
+#: fdisk/fdisk.c:1578 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:675
msgid "Device"
msgstr "Dispositivo"
-#: fdisk/fdisk.c:1603
+#: fdisk/fdisk.c:1615
#, fuzzy
msgid ""
"\n"
"Partition table entries are not in disk order\n"
msgstr "le partizioni logiche non sono nell'ordine del disco"
-#: fdisk/fdisk.c:1613
+#: fdisk/fdisk.c:1625
#, c-format
msgid ""
"\n"
@@ -2442,92 +2678,92 @@ msgstr ""
"Disco %s: %d testine, %d settori, %d cilindri\n"
"\n"
-#: fdisk/fdisk.c:1615
+#: fdisk/fdisk.c:1627
msgid "Nr AF Hd Sec Cyl Hd Sec Cyl Start Size ID\n"
msgstr " Nr AF Hd Sec Cyl Hd Sec Cyl Start Size ID\n"
-#: fdisk/fdisk.c:1659
+#: fdisk/fdisk.c:1671
#, c-format
msgid "Warning: partition %d contains sector 0\n"
msgstr "Attenzione: la partizione %d contiene il settore 0\n"
-#: fdisk/fdisk.c:1662
+#: fdisk/fdisk.c:1674
#, c-format
msgid "Partition %d: head %d greater than maximum %d\n"
msgstr "Partizione %d: testina %d più grande del massimo %d\n"
-#: fdisk/fdisk.c:1665
+#: fdisk/fdisk.c:1677
#, c-format
msgid "Partition %d: sector %d greater than maximum %d\n"
msgstr "Partizione %d: settore %d più grande del massimo %d\n"
-#: fdisk/fdisk.c:1668
+#: fdisk/fdisk.c:1680
#, c-format
msgid "Partitions %d: cylinder %d greater than maximum %d\n"
msgstr "Partizione %d: cilindro %d più grande del massimo %d\n"
-#: fdisk/fdisk.c:1672
+#: fdisk/fdisk.c:1684
#, c-format
msgid "Partition %d: previous sectors %d disagrees with total %d\n"
msgstr "Partizione %d: dissenso dei settori precedenti %d con il totale %d\n"
-#: fdisk/fdisk.c:1704
+#: fdisk/fdisk.c:1716
#, c-format
msgid "Warning: bad start-of-data in partition %d\n"
msgstr "Attenzione: inizio dati danneggiato nella partizione %d\n"
-#: fdisk/fdisk.c:1712
+#: fdisk/fdisk.c:1724
#, c-format
msgid "Warning: partition %d overlaps partition %d.\n"
msgstr "Attenzione: la partizione %d si sovrappone alla partizione %d.\n"
-#: fdisk/fdisk.c:1732
+#: fdisk/fdisk.c:1744
#, c-format
msgid "Warning: partition %d is empty\n"
msgstr "Attenzione: la partizione %d è vuota\n"
-#: fdisk/fdisk.c:1737
+#: fdisk/fdisk.c:1749
#, c-format
msgid "Logical partition %d not entirely in partition %d\n"
msgstr "La partizione logica %d non è interamente nella partizione %d\n"
-#: fdisk/fdisk.c:1743
+#: fdisk/fdisk.c:1755
#, c-format
msgid "Total allocated sectors %d greater than the maximum %d\n"
msgstr "Numero %d totale dei settori allocati superiore al massimo %d\n"
-#: fdisk/fdisk.c:1746
+#: fdisk/fdisk.c:1758
#, c-format
msgid "%d unallocated sectors\n"
msgstr "%d settori non allocati\n"
-#: fdisk/fdisk.c:1759 fdisk/fdisksgilabel.c:661 fdisk/fdisksunlabel.c:505
+#: fdisk/fdisk.c:1771 fdisk/fdisksgilabel.c:661 fdisk/fdisksunlabel.c:505
#, c-format
msgid "Partition %d is already defined. Delete it before re-adding it.\n"
msgstr ""
"La partizione %d è già definita. Cancellarla prima di riaggiungerla.\n"
-#: fdisk/fdisk.c:1780 fdisk/fdiskbsdlabel.c:279 fdisk/fdisksgilabel.c:683
+#: fdisk/fdisk.c:1792 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:683
#: fdisk/fdisksunlabel.c:520
#, c-format
msgid "First %s"
msgstr "Primo %s"
-#: fdisk/fdisk.c:1795 fdisk/fdisksunlabel.c:561
+#: fdisk/fdisk.c:1807 fdisk/fdisksunlabel.c:561
#, c-format
msgid "Sector %d is already allocated\n"
msgstr "Il settore %d è già allocato\n"
-#: fdisk/fdisk.c:1831
+#: fdisk/fdisk.c:1843
msgid "No free sectors available\n"
msgstr "Non ci sono settori liberi disponibili\n"
-#: fdisk/fdisk.c:1840 fdisk/fdiskbsdlabel.c:286 fdisk/fdisksunlabel.c:572
+#: fdisk/fdisk.c:1852 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:572
#, c-format
msgid "Last %s or +size or +sizeM or +sizeK"
msgstr "Ultimo %s o +size o +sizeM o +sizeK "
-#: fdisk/fdisk.c:1905
+#: fdisk/fdisk.c:1917
msgid ""
"\tSorry - this fdisk cannot handle AIX disk labels.\n"
"\tIf you want to add DOS-type partitions, create\n"
@@ -2535,17 +2771,17 @@ msgid ""
"\tWARNING: This will destroy the present disk contents.\n"
msgstr ""
-#: fdisk/fdisk.c:1914 fdisk/fdiskbsdlabel.c:613
+#: fdisk/fdisk.c:1926 fdisk/fdiskbsdlabel.c:617
msgid "The maximum number of partitions has been created\n"
msgstr "È stato creato il numero massimo di partizioni\n"
-#: fdisk/fdisk.c:1924
+#: fdisk/fdisk.c:1936
msgid "You must delete some partition and add an extended partition first\n"
msgstr ""
"Si devono eliminare alcune partizioni e aggiungere anzitutto una partizione "
"estesa\n"
-#: fdisk/fdisk.c:1929
+#: fdisk/fdisk.c:1941
#, c-format
msgid ""
"Command action\n"
@@ -2556,20 +2792,20 @@ msgstr ""
" %s\n"
" p partizione primaria (1-4)\n"
-#: fdisk/fdisk.c:1931
+#: fdisk/fdisk.c:1943
msgid "l logical (5 or over)"
msgstr "l logica (5 od oltre)"
-#: fdisk/fdisk.c:1931
+#: fdisk/fdisk.c:1943
msgid "e extended"
msgstr " e estesa"
-#: fdisk/fdisk.c:1948
+#: fdisk/fdisk.c:1960
#, c-format
msgid "Invalid partition number for type `%c'\n"
msgstr "Numero di partizioni non valido per il tipo `%c'\n"
-#: fdisk/fdisk.c:1984
+#: fdisk/fdisk.c:1996
msgid ""
"The partition table has been altered!\n"
"\n"
@@ -2577,11 +2813,11 @@ msgstr ""
"La tabella delle partizioni è stata alterata!\n"
"\n"
-#: fdisk/fdisk.c:1993
+#: fdisk/fdisk.c:2005
msgid "Calling ioctl() to re-read partition table.\n"
msgstr "Chiamata di ioctl() per rileggere la tabella delle partizioni.\n"
-#: fdisk/fdisk.c:2009
+#: fdisk/fdisk.c:2021
#, c-format
msgid ""
"\n"
@@ -2590,7 +2826,7 @@ msgid ""
"The new table will be used at the next reboot.\n"
msgstr ""
-#: fdisk/fdisk.c:2019
+#: fdisk/fdisk.c:2031
msgid ""
"\n"
"WARNING: If you have created or modified any DOS 6.x\n"
@@ -2602,68 +2838,68 @@ msgstr ""
"consultare la pagina del manuale fdisk per ulteriori\n"
"informazioni.\n"
-#: fdisk/fdisk.c:2026
+#: fdisk/fdisk.c:2038
msgid "Syncing disks.\n"
msgstr "Sincronizzazione dei dischi in corso.\n"
-#: fdisk/fdisk.c:2073
+#: fdisk/fdisk.c:2085
#, c-format
msgid "Partition %d has no data area\n"
msgstr "La partizione %d non ha area dati\n"
-#: fdisk/fdisk.c:2078
+#: fdisk/fdisk.c:2090
msgid "New beginning of data"
msgstr "Nuovo inizio dati"
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2106
msgid "Expert command (m for help): "
msgstr "Comando per esperti (m per richiamare la guida): "
-#: fdisk/fdisk.c:2107
+#: fdisk/fdisk.c:2119
msgid "Number of cylinders"
msgstr "Numero di cilindri"
-#: fdisk/fdisk.c:2134
+#: fdisk/fdisk.c:2146
msgid "Number of heads"
msgstr "Numero di testine"
-#: fdisk/fdisk.c:2159
+#: fdisk/fdisk.c:2171
msgid "Number of sectors"
msgstr "Numero di settori"
-#: fdisk/fdisk.c:2162
+#: fdisk/fdisk.c:2174
msgid "Warning: setting sector offset for DOS compatiblity\n"
msgstr ""
"Attenzione: impostare l'offset di settore per assicurare compatibilità con "
"DOS\n"
-#: fdisk/fdisk.c:2237
+#: fdisk/fdisk.c:2249
#, c-format
msgid "Disk %s doesn't contain a valid partition table\n"
msgstr "Il disco %s non contiene una tabella delle partizioni valida\n"
-#: fdisk/fdisk.c:2251
+#: fdisk/fdisk.c:2263
#, c-format
msgid "Cannot open %s\n"
msgstr "Impossibile aprire %s\n"
-#: fdisk/fdisk.c:2267 fdisk/sfdisk.c:2363
+#: fdisk/fdisk.c:2279 fdisk/sfdisk.c:2363
#, c-format
msgid "cannot open %s\n"
msgstr "impossibile aprire %s\n"
-#: fdisk/fdisk.c:2289
+#: fdisk/fdisk.c:2301
#, fuzzy, c-format
msgid "%c: unknown command\n"
msgstr "%s: comando sconosciuto: %s\n"
-#: fdisk/fdisk.c:2339
+#: fdisk/fdisk.c:2351
msgid "This kernel finds the sector size itself - -b option ignored\n"
msgstr ""
"Questo kernel trova la dimensione del settore in maniera indipendente - - "
"opzione b ignorata\n"
-#: fdisk/fdisk.c:2342
+#: fdisk/fdisk.c:2355
msgid ""
"Warning: the -b (set sector size) option should be used with one specified "
"device\n"
@@ -2671,18 +2907,17 @@ msgstr ""
"Attenzione: l'opzione -b (mpostazione della dimensione del settore) si "
"dovrebbe utilizzare con un dispositivo specificato\n"
-#: fdisk/fdisk.c:2405
+#. OSF label, and no DOS label
+#: fdisk/fdisk.c:2414
#, c-format
-msgid ""
-"Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
-"To return to DOS partition table mode, use the 'r' command.\n"
+msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
msgstr ""
-#: fdisk/fdisk.c:2413
+#: fdisk/fdisk.c:2424
msgid "Command (m for help): "
msgstr "Comando (m per richiamare la guida): "
-#: fdisk/fdisk.c:2429
+#: fdisk/fdisk.c:2440
#, c-format
msgid ""
"\n"
@@ -2691,15 +2926,15 @@ msgstr ""
"\n"
"Il file d'avvio corrente è: %s\n"
-#: fdisk/fdisk.c:2431
+#: fdisk/fdisk.c:2442
msgid "Please enter the name of the new boot file: "
msgstr "Immettere il nome del nuovo file d'avvio:"
-#: fdisk/fdisk.c:2433
+#: fdisk/fdisk.c:2444
msgid "Boot file unchanged\n"
msgstr "File d'avvio immutato\n"
-#: fdisk/fdisk.c:2497
+#: fdisk/fdisk.c:2508
msgid ""
"\n"
"\tSorry, no experts menu for SGI partition tables available.\n"
@@ -2738,7 +2973,7 @@ msgstr ""
"\t di rimuovere in maniera logica il disco dalla macchina AIX \n"
"\t (altrimenti si diviene AIXpert)."
-#: fdisk/fdiskbsdlabel.c:117
+#: fdisk/fdiskbsdlabel.c:122
#, c-format
msgid ""
"\n"
@@ -2747,168 +2982,168 @@ msgstr ""
"\n"
"Etichetta BSD per dispositivo: %s\n"
-#: fdisk/fdiskbsdlabel.c:125
+#: fdisk/fdiskbsdlabel.c:130
msgid " d delete a BSD partition"
msgstr " d eliminanazione di una partizione BSD"
-#: fdisk/fdiskbsdlabel.c:126
+#: fdisk/fdiskbsdlabel.c:131
msgid " e edit drive data"
msgstr " e modifica dei dati dell'unità"
-#: fdisk/fdiskbsdlabel.c:127
+#: fdisk/fdiskbsdlabel.c:132
msgid " i install bootstrap"
msgstr " i installazione di bootstrap"
-#: fdisk/fdiskbsdlabel.c:128
+#: fdisk/fdiskbsdlabel.c:133
msgid " l list known filesystem types"
msgstr " l elenco dei tipi di filesystem conosciuti"
-#: fdisk/fdiskbsdlabel.c:130
+#: fdisk/fdiskbsdlabel.c:135
msgid " n add a new BSD partition"
msgstr " n aggiunta di una nuova partizione BSD"
-#: fdisk/fdiskbsdlabel.c:131
+#: fdisk/fdiskbsdlabel.c:136
msgid " p print BSD partition table"
msgstr " p stampa della tabella delle partizioni BSD"
-#: fdisk/fdiskbsdlabel.c:134
+#: fdisk/fdiskbsdlabel.c:139
msgid " s show complete disklabel"
msgstr " s visualizzazione del disklabel completo"
-#: fdisk/fdiskbsdlabel.c:135
+#: fdisk/fdiskbsdlabel.c:140
msgid " t change a partition's filesystem id"
msgstr " t modifica dell'id del filesystem di una partizione"
-#: fdisk/fdiskbsdlabel.c:136
+#: fdisk/fdiskbsdlabel.c:141
#, fuzzy
msgid " u change units (cylinders/sectors)"
msgstr " c modifica del numero di cilindri"
-#: fdisk/fdiskbsdlabel.c:137
+#: fdisk/fdiskbsdlabel.c:142
msgid " w write disklabel to disk"
msgstr " w scrittura del disklabel su disco"
-#: fdisk/fdiskbsdlabel.c:139
+#: fdisk/fdiskbsdlabel.c:144
msgid " x link BSD partition to non-BSD partition"
msgstr " x collegamento della partizione BSD a una non-BSD"
-#: fdisk/fdiskbsdlabel.c:171
+#: fdisk/fdiskbsdlabel.c:176
#, fuzzy, c-format
msgid "Partition %s has invalid starting sector 0.\n"
msgstr "La partizione %s%d ha settore di inizio 0: dato non valido.\n"
-#: fdisk/fdiskbsdlabel.c:175
+#: fdisk/fdiskbsdlabel.c:180
#, fuzzy, c-format
msgid "Reading disklabel of %s at sector %d.\n"
msgstr "Lettura del disklabel di %s%d al settore %d.\n"
-#: fdisk/fdiskbsdlabel.c:185
+#: fdisk/fdiskbsdlabel.c:190
#, c-format
msgid "There is no *BSD partition on %s.\n"
msgstr "Non esiste partizione *BSD su %s.\n"
-#: fdisk/fdiskbsdlabel.c:199
+#: fdisk/fdiskbsdlabel.c:204
msgid "BSD disklabel command (m for help): "
msgstr "Comando disklabel BSD (m per richiamare la guida): "
-#: fdisk/fdiskbsdlabel.c:313
+#: fdisk/fdiskbsdlabel.c:318
#, c-format
msgid "type: %s\n"
msgstr "tipo: %s\n"
-#: fdisk/fdiskbsdlabel.c:315
+#: fdisk/fdiskbsdlabel.c:320
#, c-format
msgid "type: %d\n"
msgstr "tipo: %d\n"
-#: fdisk/fdiskbsdlabel.c:316
+#: fdisk/fdiskbsdlabel.c:321
#, c-format
msgid "disk: %.*s\n"
msgstr "disco: %.*s\n"
-#: fdisk/fdiskbsdlabel.c:317
+#: fdisk/fdiskbsdlabel.c:322
#, c-format
msgid "label: %.*s\n"
msgstr "etichetta: %.*s\n"
-#: fdisk/fdiskbsdlabel.c:318
+#: fdisk/fdiskbsdlabel.c:323
msgid "flags:"
msgstr "flag:"
-#: fdisk/fdiskbsdlabel.c:320
+#: fdisk/fdiskbsdlabel.c:325
msgid " removable"
msgstr " rimovibile"
-#: fdisk/fdiskbsdlabel.c:322
+#: fdisk/fdiskbsdlabel.c:327
msgid " ecc"
msgstr " ecc"
-#: fdisk/fdiskbsdlabel.c:324
+#: fdisk/fdiskbsdlabel.c:329
msgid " badsect"
msgstr " badsect"
#. On various machines the fields of *lp are short/int/long
#. In order to avoid problems, we cast them all to long.
-#: fdisk/fdiskbsdlabel.c:328
+#: fdisk/fdiskbsdlabel.c:333
#, c-format
msgid "bytes/sector: %ld\n"
msgstr "byte/settore: %ld\n"
-#: fdisk/fdiskbsdlabel.c:329
+#: fdisk/fdiskbsdlabel.c:334
#, c-format
msgid "sectors/track: %ld\n"
msgstr "settori/traccia: %ld\n"
-#: fdisk/fdiskbsdlabel.c:330
+#: fdisk/fdiskbsdlabel.c:335
#, c-format
msgid "tracks/cylinder: %ld\n"
msgstr "tracce/cilindro: %ld\n"
-#: fdisk/fdiskbsdlabel.c:331
+#: fdisk/fdiskbsdlabel.c:336
#, c-format
msgid "sectors/cylinder: %ld\n"
msgstr "settori/cilindro: %ld\n"
-#: fdisk/fdiskbsdlabel.c:332
+#: fdisk/fdiskbsdlabel.c:337
#, c-format
msgid "cylinders: %ld\n"
msgstr "cilindri: %ld\n"
-#: fdisk/fdiskbsdlabel.c:333
+#: fdisk/fdiskbsdlabel.c:338
#, c-format
msgid "rpm: %d\n"
msgstr "rpm: %d\n"
-#: fdisk/fdiskbsdlabel.c:334
+#: fdisk/fdiskbsdlabel.c:339
#, c-format
msgid "interleave: %d\n"
msgstr " interleave: %d\n"
-#: fdisk/fdiskbsdlabel.c:335
+#: fdisk/fdiskbsdlabel.c:340
#, c-format
msgid "trackskew: %d\n"
msgstr "trackskew: %d\n"
-#: fdisk/fdiskbsdlabel.c:336
+#: fdisk/fdiskbsdlabel.c:341
#, c-format
msgid "cylinderskew: %d\n"
msgstr "cylinderskew: %d\n"
-#: fdisk/fdiskbsdlabel.c:337
+#: fdisk/fdiskbsdlabel.c:342
#, c-format
msgid "headswitch: %ld\t\t# milliseconds\n"
msgstr "headswitch: %ld\t\t# millisecondi\n"
-#: fdisk/fdiskbsdlabel.c:339
+#: fdisk/fdiskbsdlabel.c:344
#, c-format
msgid "track-to-track seek: %ld\t# milliseconds\n"
msgstr "ricerca traccia-a-traccia: %ld\t# millisecondi\n"
-#: fdisk/fdiskbsdlabel.c:341
+#: fdisk/fdiskbsdlabel.c:346
msgid "drivedata: "
msgstr "datiunità:"
-#: fdisk/fdiskbsdlabel.c:350
+#: fdisk/fdiskbsdlabel.c:355
#, c-format
msgid ""
"\n"
@@ -2917,98 +3152,98 @@ msgstr ""
"\n"
"%d partizioni:\n"
-#: fdisk/fdiskbsdlabel.c:351
+#: fdisk/fdiskbsdlabel.c:356
#, fuzzy
msgid "# start end size fstype [fsize bsize cpg]\n"
msgstr "# size offset fstype [fsize bsize cpg]\n"
-#: fdisk/fdiskbsdlabel.c:400 fdisk/fdiskbsdlabel.c:403
+#: fdisk/fdiskbsdlabel.c:405 fdisk/fdiskbsdlabel.c:408
#, c-format
msgid "Writing disklabel to %s.\n"
msgstr "Scrittura del disklabel su %s in corso.\n"
-#: fdisk/fdiskbsdlabel.c:415 fdisk/fdiskbsdlabel.c:417
+#: fdisk/fdiskbsdlabel.c:420 fdisk/fdiskbsdlabel.c:422
#, c-format
msgid "%s contains no disklabel.\n"
msgstr "%s non contiene disklabel.\n"
-#: fdisk/fdiskbsdlabel.c:422
+#: fdisk/fdiskbsdlabel.c:427
msgid "Do you want to create a disklabel? (y/n) "
msgstr "Creare un disklabel? (s/n)"
-#: fdisk/fdiskbsdlabel.c:461
+#: fdisk/fdiskbsdlabel.c:466
msgid "bytes/sector"
msgstr "byte/settore"
-#: fdisk/fdiskbsdlabel.c:462
+#: fdisk/fdiskbsdlabel.c:467
msgid "sectors/track"
msgstr "settori/traccia"
-#: fdisk/fdiskbsdlabel.c:463
+#: fdisk/fdiskbsdlabel.c:468
msgid "tracks/cylinder"
msgstr "tracce/cilindro"
-#: fdisk/fdiskbsdlabel.c:471
+#: fdisk/fdiskbsdlabel.c:476
msgid "sectors/cylinder"
msgstr "settori/cilindro"
-#: fdisk/fdiskbsdlabel.c:475
+#: fdisk/fdiskbsdlabel.c:480
msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
msgstr " Deve essere <= settori/traccia * tracce/cilindro (predefinito).\n"
-#: fdisk/fdiskbsdlabel.c:477
+#: fdisk/fdiskbsdlabel.c:482
msgid "rpm"
msgstr "rpm"
-#: fdisk/fdiskbsdlabel.c:478
+#: fdisk/fdiskbsdlabel.c:483
msgid "interleave"
msgstr "interleave"
-#: fdisk/fdiskbsdlabel.c:479
+#: fdisk/fdiskbsdlabel.c:484
msgid "trackskew"
msgstr "trackskew"
-#: fdisk/fdiskbsdlabel.c:480
+#: fdisk/fdiskbsdlabel.c:485
msgid "cylinderskew"
msgstr "cylinderskew"
-#: fdisk/fdiskbsdlabel.c:481
+#: fdisk/fdiskbsdlabel.c:486
msgid "headswitch"
msgstr "headswitch"
-#: fdisk/fdiskbsdlabel.c:482
+#: fdisk/fdiskbsdlabel.c:487
msgid "track-to-track seek"
msgstr "ricerca traccia-a-traccia"
-#: fdisk/fdiskbsdlabel.c:523
+#: fdisk/fdiskbsdlabel.c:528
#, c-format
msgid "Bootstrap: %sboot -> boot%s (%s): "
msgstr "Bootstrap: %sboot -> boot%s (%s): "
-#: fdisk/fdiskbsdlabel.c:548
+#: fdisk/fdiskbsdlabel.c:553
msgid "Bootstrap overlaps with disk label!\n"
msgstr "Sovrapposizione del bootstrap con il disklabel!\n"
-#: fdisk/fdiskbsdlabel.c:569 fdisk/fdiskbsdlabel.c:571
+#: fdisk/fdiskbsdlabel.c:574 fdisk/fdiskbsdlabel.c:576
#, c-format
msgid "Bootstrap installed on %s.\n"
msgstr "Bootstrap installato su %s.\n"
-#: fdisk/fdiskbsdlabel.c:593
+#: fdisk/fdiskbsdlabel.c:598
#, c-format
msgid "Partition (a-%c): "
msgstr "Partizione (a-%c): "
-#: fdisk/fdiskbsdlabel.c:624
+#: fdisk/fdiskbsdlabel.c:629
msgid "This partition already exists.\n"
msgstr "Questa partizione esiste già.\n"
-#: fdisk/fdiskbsdlabel.c:744
+#: fdisk/fdiskbsdlabel.c:755
#, c-format
msgid "Warning: too many partitions (%d, maximum is %d).\n"
msgstr "Attenzione: troppe partizioni (%d, il massimo è %d).\n"
-#: fdisk/fdiskbsdlabel.c:791
+#: fdisk/fdiskbsdlabel.c:803
msgid ""
"\n"
"Syncing disks.\n"
@@ -4987,139 +5222,125 @@ msgstr "getopt (avanzato) 1.0.3\n"
msgid "internal error, contact the author."
msgstr "errore interno, contattare l'autore."
-#: hwclock/cmos.c:168
+#: hwclock/cmos.c:172
msgid "booted from MILO\n"
msgstr "avviato da MILO\n"
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:181
msgid "Ruffian BCD clock\n"
msgstr "Ruffian BCD clock\n"
-#: hwclock/cmos.c:193
+#: hwclock/cmos.c:197
#, c-format
msgid "clockport adjusted to 0x%x\n"
msgstr "porta clock regolata su 0x%x\n"
-#: hwclock/cmos.c:205
+#: hwclock/cmos.c:209
msgid "funky TOY!\n"
msgstr "funky TOY!\n"
-#: hwclock/cmos.c:259
+#: hwclock/cmos.c:263
#, c-format
msgid "%s: atomic %s failed for 1000 iterations!"
msgstr "%s: %s atomico non è riuscito per 1000 iterazioni!"
-#: hwclock/cmos.c:583
+#: hwclock/cmos.c:587
#, c-format
msgid "Cannot open /dev/port: %s"
msgstr "Impossibile aprire /dev/port: %s"
-#: hwclock/cmos.c:590
+#: hwclock/cmos.c:594
msgid "I failed to get permission because I didn't try.\n"
msgstr ""
"Non sono riuscito ad ottenere l'autorizzazione perché non ho provato.\n"
-#: hwclock/cmos.c:593
+#: hwclock/cmos.c:597
#, c-format
msgid "%s is unable to get I/O port access: the iopl(3) call failed.\n"
msgstr ""
"%s non riesce a ottenere l'accesso alla porta I/O: chiamata iopl(3)non "
"riuscita.\n"
-#: hwclock/cmos.c:596
+#: hwclock/cmos.c:600
msgid "Probably you need root privileges.\n"
msgstr "Probabilmente sono necessari privilegi di root.\n"
-#: hwclock/hwclock.c:219
+#: hwclock/hwclock.c:223
#, c-format
msgid "Assuming hardware clock is kept in %s time.\n"
msgstr "Si presuppone che il clock hardware sia mantenuto nell'orario %s.\n"
-#: hwclock/hwclock.c:220 hwclock/hwclock.c:314
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
msgid "UTC"
msgstr "UTC"
-#: hwclock/hwclock.c:220 hwclock/hwclock.c:313
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
msgid "local"
msgstr "locale"
-#: hwclock/hwclock.c:297
+#: hwclock/hwclock.c:303
#, c-format
msgid "%s: Warning: unrecognized third line in adjtime file\n"
msgstr "%s: attenzione: terza linea non riconosciuta nel file adjtime\n"
-#: hwclock/hwclock.c:299
+#: hwclock/hwclock.c:305
msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
msgstr "(Previsto: `UTC' o `LOCAL' o niente.)\n"
-#: hwclock/hwclock.c:308
+#: hwclock/hwclock.c:312
#, fuzzy, c-format
msgid "Last drift adjustment done at %ld seconds after 1969\n"
msgstr "Ultima regolazione della deriva effettuata %d secondi dopo il 1969\n"
-#: hwclock/hwclock.c:310
+#: hwclock/hwclock.c:314
#, fuzzy, c-format
msgid "Last calibration done at %ld seconds after 1969\n"
msgstr "Ultima calibrazione effettuata %d secondi dopo il 1969\n"
-#: hwclock/hwclock.c:312
+#: hwclock/hwclock.c:316
#, c-format
msgid "Hardware clock is on %s time\n"
msgstr "Il clock hardware è sull'orario %s\n"
-#: hwclock/hwclock.c:314
+#: hwclock/hwclock.c:318
msgid "unknown"
msgstr "sconosciuto"
-#. -----------------------------------------------------------------------------
-#. 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.
-#.
-#. -----------------------------------------------------------------------------
-#: hwclock/hwclock.c:336
+#: hwclock/hwclock.c:342
msgid "Waiting for clock tick...\n"
msgstr "Attesa del segnale dal clock...\n"
-#: hwclock/hwclock.c:340
+#: hwclock/hwclock.c:346
msgid "...got clock tick\n"
msgstr "...ricevuto segnale dal clock\n"
-#: hwclock/hwclock.c:391
+#: hwclock/hwclock.c:399
#, fuzzy, c-format
msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
msgstr " Valori non validi nel clock hardware: %2d/%.2d/%.2d %.2d:%.2d:%.2d\n"
-#: hwclock/hwclock.c:399
+#: hwclock/hwclock.c:407
#, fuzzy, c-format
msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
msgstr ""
" Orario clock hardware : %2d/%.2d/%.2d %.2d:%.2d:%.2d = %d secondi dal 1969\n"
-#: hwclock/hwclock.c:427
+#: hwclock/hwclock.c:435
#, fuzzy, c-format
msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
msgstr " Orario letto dal clock hardware: %02d:%02d:%02d\n"
-#: hwclock/hwclock.c:454
+#: hwclock/hwclock.c:462
#, fuzzy, c-format
msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
msgstr ""
" Impostazione del clock hardware a %.2d:%.2d:%.2d = %d secondi dal 1969\n"
-#: hwclock/hwclock.c:460
+#: hwclock/hwclock.c:468
msgid "Clock not changed - testing only.\n"
msgstr "Nessun cambio del clock - si tratta solamente di una verifica.\n"
-#: hwclock/hwclock.c:508
+#: hwclock/hwclock.c:516
#, c-format
msgid ""
"Time elapsed since reference time has been %.6f seconds.\n"
@@ -5128,7 +5349,7 @@ msgstr ""
"Il tempo trascorso dall'orario di riferimento e' stato di %.6f secondi.\n"
"Accumulare ulteriore ritardo per raggiungere il secondo pieno successivo.\n"
-#: hwclock/hwclock.c:532
+#: hwclock/hwclock.c:540
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"
@@ -5137,20 +5358,20 @@ msgstr ""
"50esimo giorno del mese) oppure oltre l'intervallo che è possibile gestire "
"(per es. anno 2095).\n"
-#: hwclock/hwclock.c:542
+#: hwclock/hwclock.c:550
#, c-format
msgid "%s %.6f seconds\n"
msgstr "%s %.6f secondi\n"
-#: hwclock/hwclock.c:576
+#: hwclock/hwclock.c:584
msgid "No --date option specified.\n"
msgstr "Opzione --date non specificata.\n"
-#: hwclock/hwclock.c:582
+#: hwclock/hwclock.c:590
msgid "--date argument too long\n"
msgstr ""
-#: hwclock/hwclock.c:589
+#: hwclock/hwclock.c:597
msgid ""
"The value of the --date option is not a valid date.\n"
"In particular, it contains quotation marks.\n"
@@ -5158,22 +5379,22 @@ msgstr ""
"Il valore dell'opzione --date non è una data valida.\n"
"In particolare, contiene virgolette.\n"
-#: hwclock/hwclock.c:597
+#: hwclock/hwclock.c:605
#, c-format
msgid "Issuing date command: %s\n"
msgstr "Esecuzione comando date: %s\n"
-#: hwclock/hwclock.c:601
+#: hwclock/hwclock.c:609
msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
msgstr ""
"Impossibile eseguire il programma 'date' nella shell /bin/sh. popen() fallito"
-#: hwclock/hwclock.c:609
+#: hwclock/hwclock.c:617
#, c-format
msgid "response from date command = %s\n"
msgstr "risposta dal comando date = %s\n"
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:619
#, c-format
msgid ""
"The date command issued by %s returned unexpected results.\n"
@@ -5188,7 +5409,7 @@ msgstr ""
"La risposta è stata:\n"
" %s\n"
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:631
#, fuzzy, c-format
msgid ""
"The date command issued by %s returned something other than an integer where "
@@ -5205,12 +5426,12 @@ msgstr ""
"La risposta è stata:\n"
" %s\n"
-#: hwclock/hwclock.c:634
+#: hwclock/hwclock.c:642
#, fuzzy, c-format
msgid "date string %s equates to %ld seconds since 1969.\n"
msgstr "la stringa della data %s equivale a %d secondi dal 1969.\n"
-#: hwclock/hwclock.c:666
+#: hwclock/hwclock.c:674
msgid ""
"The Hardware Clock does not contain a valid time, so we cannot set the "
"System Time from it.\n"
@@ -5218,35 +5439,35 @@ msgstr ""
"Il clock hardware non contiene un orario valido, perciò non è possibile "
"impostare l'ora del sistema a partire da esso.\n"
-#: hwclock/hwclock.c:688
+#: hwclock/hwclock.c:696
msgid "Calling settimeofday:\n"
msgstr " Chiamata settimeofday in corso:\n"
-#: hwclock/hwclock.c:689
+#: hwclock/hwclock.c:697
#, c-format
msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
-#: hwclock/hwclock.c:691
+#: hwclock/hwclock.c:699
#, fuzzy, c-format
msgid "\ttz.tz_minuteswest = %d\n"
msgstr "\ttz.tz_minuteswest = %ld\n"
-#: hwclock/hwclock.c:694
+#: hwclock/hwclock.c:702
msgid "Not setting system clock because running in test mode.\n"
msgstr ""
"Il clock di sistema non viene impostato perché sta funzionando in modalità "
"test.\n"
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:711
msgid "Must be superuser to set system clock.\n"
msgstr "Bisogna essere superuser per impostare il clock del sistema\n"
-#: hwclock/hwclock.c:704
+#: hwclock/hwclock.c:714
msgid "settimeofday() failed"
msgstr " settimeofday() non riuscito"
-#: hwclock/hwclock.c:737
+#: hwclock/hwclock.c:744
msgid ""
"Not adjusting drift factor because the Hardware Clock previously contained "
"garbage.\n"
@@ -5254,7 +5475,16 @@ msgstr ""
"Non viene effettuata la regolazione del fattore di deriva poiché in "
"precedenza il clock hardwareconteneva elementi insoliti.\n"
-#: hwclock/hwclock.c:741
+#: hwclock/hwclock.c:749
+#, fuzzy
+msgid ""
+"Not adjusting drift factor because last calibration time is zero,\n"
+"so history is bad and calibration startover is necessary.\n"
+msgstr ""
+"Non viene effettuata la regolazione del fattore di deriva poiché è trascorso "
+"meno di un giornodall'ultima calibrazione.\n"
+
+#: hwclock/hwclock.c:755
msgid ""
"Not adjusting drift factor because it has been less than a day since the "
"last calibration.\n"
@@ -5262,10 +5492,10 @@ msgstr ""
"Non viene effettuata la regolazione del fattore di deriva poiché è trascorso "
"meno di un giornodall'ultima calibrazione.\n"
-#: hwclock/hwclock.c:750
-#, c-format
+#: hwclock/hwclock.c:803
+#, fuzzy, c-format
msgid ""
-"Clock drifted %d seconds in the past %d seconds in spite of a drift factor "
+"Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
"of %f seconds/day.\n"
"Adjusting drift factor by %f seconds/day\n"
msgstr ""
@@ -5273,22 +5503,22 @@ msgstr ""
"nonostante il fattoredi deriva fosse di %f secondi/giorno.\n"
"Regolazione del fattore di deriva a %f secondi/giorno\n"
-#: hwclock/hwclock.c:801
+#: hwclock/hwclock.c:854
#, c-format
msgid "Time since last adjustment is %d seconds\n"
msgstr "Il tempo trascorso dall'ultima regolazione è di %d secondi\n"
-#: hwclock/hwclock.c:803
+#: hwclock/hwclock.c:856
#, c-format
msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
msgstr ""
"È necessario inserire %d secondi e riportare l'ora indietro di %.6f secondi\n"
-#: hwclock/hwclock.c:832
+#: hwclock/hwclock.c:885
msgid "Not updating adjtime file because of testing mode.\n"
msgstr "Il file adjtime non viene aggiornato a causa della modalità test.\n"
-#: hwclock/hwclock.c:833
+#: hwclock/hwclock.c:886
#, c-format
msgid ""
"Would have written the following to %s:\n"
@@ -5297,37 +5527,37 @@ msgstr ""
"Si sarebbe scritto quanto segue in %s:\n"
"%s"
-#: hwclock/hwclock.c:857
+#: hwclock/hwclock.c:910
msgid "Drift adjustment parameters not updated.\n"
msgstr "Parametri di regolazione della deriva non aggiornati.\n"
-#: hwclock/hwclock.c:898
+#: hwclock/hwclock.c:951
msgid ""
"The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
msgstr ""
"Il clock hardware non contiene un'ora valida, perciò non è possibile "
"regolarlo.\n"
-#: hwclock/hwclock.c:922
+#: hwclock/hwclock.c:983
msgid "Needed adjustment is less than one second, so not setting clock.\n"
msgstr ""
"La regolazione necessaria equivale a meno di un secondo, perciò il clock non "
"viene impostato.\n"
-#: hwclock/hwclock.c:948
+#: hwclock/hwclock.c:1009
#, c-format
msgid "Using %s.\n"
msgstr "Utilizzo di %s in corso.\n"
-#: hwclock/hwclock.c:950
+#: hwclock/hwclock.c:1011
msgid "No usable clock interface found.\n"
msgstr "Impossibile trovare un'interfaccia clock utilizzabile.\n"
-#: hwclock/hwclock.c:1045
+#: hwclock/hwclock.c:1107
msgid "Unable to set system clock.\n"
msgstr "Impossibile impostare il clock di sistema.\n"
-#: hwclock/hwclock.c:1076
+#: hwclock/hwclock.c:1137
msgid ""
"The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
"machine.\n"
@@ -5341,16 +5571,16 @@ msgstr ""
"(e quindi, presumibilmente, non può essere eseguita su un Alpha in questo "
"momento). Nessuna azione intrapresa.\n"
-#: hwclock/hwclock.c:1085
+#: hwclock/hwclock.c:1146
msgid "Unable to get the epoch value from the kernel.\n"
msgstr "Impossibile ottenere il valore epoch dal kernel.\n"
-#: hwclock/hwclock.c:1087
+#: hwclock/hwclock.c:1148
#, c-format
msgid "Kernel is assuming an epoch value of %lu\n"
msgstr "Il kernel pressuppone un valore epoch di %lu\n"
-#: hwclock/hwclock.c:1090
+#: hwclock/hwclock.c:1151
msgid ""
"To set the epoch value, you must use the 'epoch' option to tell to what "
"value to set it.\n"
@@ -5358,18 +5588,18 @@ msgstr ""
"Per impostare il valore epoch si deve utilizzare l'opzione 'epoch' per "
"indicare su quale valore impostarlo.\n"
-#: hwclock/hwclock.c:1093
+#: hwclock/hwclock.c:1154
#, c-format
msgid "Not setting the epoch to %d - testing only.\n"
msgstr ""
"Non viene impostato il valore epoch a %d - si tratta solamente di una "
"verifica.\n"
-#: hwclock/hwclock.c:1096
+#: hwclock/hwclock.c:1157
msgid "Unable to set the epoch value in the kernel.\n"
msgstr "Impossibile impostare il valore epoch nel kernel.\n"
-#: hwclock/hwclock.c:1125
+#: hwclock/hwclock.c:1191
#, fuzzy, c-format
msgid ""
"hwclock - query and set the hardware clock (RTC)\n"
@@ -5428,7 +5658,7 @@ msgstr ""
" --epoch=anno specifica l'anno che è l'inizio per il \n"
" valore epoch del clock hardware\n"
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1218
msgid ""
" --jensen, --arc, --srm, --funky-toy\n"
" tell hwclock the type of alpha you have (see hwclock(8))\n"
@@ -5437,21 +5667,22 @@ msgstr ""
" indicano al hwclock il tipo di alpha utilizzato (consultare "
"hwclock(8))\n"
-#: hwclock/hwclock.c:1257
+#: hwclock/hwclock.c:1392
#, c-format
msgid "%s takes no non-option arguments. You supplied %d.\n"
msgstr ""
"%s non considera argomenti che non siano opzioni. È stato fornito %d.\n"
-#: hwclock/hwclock.c:1267
+#: hwclock/hwclock.c:1398
+#, fuzzy
msgid ""
-"You have specified multiple function options.\n"
+"You have specified multiple functions.\n"
"You can only perform one function at a time.\n"
msgstr ""
"Sono state specificate opzioni di funzione multipla.\n"
"È possibile eseguire una sola funzione per volta.\n"
-#: hwclock/hwclock.c:1273
+#: hwclock/hwclock.c:1405
#, c-format
msgid ""
"%s: The --utc and --localtime options are mutually exclusive. You specified "
@@ -5460,7 +5691,7 @@ msgstr ""
"%s: Le opzioni --utc e -localtime si escludono vicendevolmente. Sono state "
"specificate entrambe.\n"
-#: hwclock/hwclock.c:1279
+#: hwclock/hwclock.c:1412
#, fuzzy, c-format
msgid ""
"%s: The --adjust and --noadjfile options are mutually exclusive. You "
@@ -5469,37 +5700,37 @@ msgstr ""
"%s: Le opzioni --utc e -localtime si escludono vicendevolmente. Sono state "
"specificate entrambe.\n"
-#: hwclock/hwclock.c:1285
+#: hwclock/hwclock.c:1419
#, c-format
msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
msgstr ""
-#: hwclock/hwclock.c:1298
+#: hwclock/hwclock.c:1433
msgid "No usable set-to time. Cannot set clock.\n"
msgstr ""
"Impossibile utilizzare l'ora impostata. Impossibile impostare il clock.\n"
-#: hwclock/hwclock.c:1313
+#: hwclock/hwclock.c:1449
msgid "Sorry, only the superuser can change the Hardware Clock.\n"
msgstr "Spiacente, solamente il superuser può modificare il clock hardware.\n"
-#: hwclock/hwclock.c:1317
+#: hwclock/hwclock.c:1454
#, fuzzy
msgid "Sorry, only the superuser can change the System Clock.\n"
msgstr "Spiacente, solamente il superuser può modificare il clock hardware.\n"
-#: hwclock/hwclock.c:1321
+#: hwclock/hwclock.c:1459
msgid ""
"Sorry, only the superuser can change the Hardware Clock epoch in the "
"kernel.\n"
msgstr ""
"Solamente il supeuser può modificare l'epoch del clock hardware nel kernel.\n"
-#: hwclock/hwclock.c:1341
+#: hwclock/hwclock.c:1479
msgid "Cannot access the Hardware Clock via any known method.\n"
msgstr ""
-#: hwclock/hwclock.c:1344
+#: hwclock/hwclock.c:1483
#, fuzzy
msgid ""
"Use the --debug option to see the details of our search for an access "
@@ -5509,101 +5740,96 @@ msgstr ""
"conosciuto. Utilizzare l'opzione --debug per visionare i dettagli della "
"nostra ricerca di un metodo d'accesso.\n"
-#: hwclock/kd.c:42
+#: hwclock/kd.c:43
msgid "Waiting in loop for time from KDGHWCLK to change\n"
msgstr "Attesa in loop per il cambio ora da KDGHWCLK\n"
-#: hwclock/kd.c:45
+#: hwclock/kd.c:46
msgid "KDGHWCLK ioctl to read time failed"
msgstr "Lettura dell'orario con KDGHWCLK ioctl non riuscita"
-#: hwclock/kd.c:66 hwclock/rtc.c:174
+#: hwclock/kd.c:67 hwclock/rtc.c:187
msgid "Timed out waiting for time change.\n"
msgstr "Tempo d'attesa per il cambio ora esaurito.\n"
-#: hwclock/kd.c:70
+#: hwclock/kd.c:71
msgid "KDGHWCLK ioctl to read time failed in loop"
msgstr " Lettura dell'orario con KDGHWCLK ioctl non riuscita nel loop"
-#: hwclock/kd.c:92
+#: hwclock/kd.c:93
#, fuzzy, c-format
msgid "ioctl() failed to read time from %s"
msgstr " ioctl() non è riuscito a leggere l'orario da /dev/tty1"
-#: hwclock/kd.c:128
+#: hwclock/kd.c:129
#, fuzzy
msgid "ioctl KDSHWCLK failed"
msgstr " KDGHWCLK ioctl non riuscito"
-#: hwclock/kd.c:165
+#: hwclock/kd.c:166
#, fuzzy
msgid "Can't open /dev/tty1 or /dev/vc/1"
msgstr "Impossibile aprire /dev/tty1"
-#: hwclock/kd.c:170
+#: hwclock/kd.c:171
msgid "KDGHWCLK ioctl failed"
msgstr " KDGHWCLK ioctl non riuscito"
-#: hwclock/rtc.c:136
+#: hwclock/rtc.c:115 hwclock/rtc.c:208
+#, c-format
+msgid "open() of %s failed"
+msgstr "open() di %s fallita"
+
+#: hwclock/rtc.c:149
#, c-format
msgid "ioctl() to %s to read the time failed.\n"
msgstr "Lettura dell'orario attraverso ioctl() su %s non riuscita.\n"
-#: hwclock/rtc.c:158
+#: hwclock/rtc.c:171
#, c-format
msgid "Waiting in loop for time from %s to change\n"
msgstr "Attesa in loop per il cambio ora da %s\n"
-#: hwclock/rtc.c:195 hwclock/rtc.c:250
-#, c-format
-msgid "open() of %s failed"
-msgstr "open() di %s fallita"
-
-#: hwclock/rtc.c:213
+#: hwclock/rtc.c:226
#, c-format
msgid "%s does not have interrupt functions. "
msgstr "%s non ha funzioni di interrupt. "
-#: hwclock/rtc.c:222
+#: hwclock/rtc.c:235
#, c-format
msgid "read() to %s to wait for clock tick failed"
msgstr " read() su %s per l'attesa del segnale dal clock fallita"
-#: hwclock/rtc.c:231
+#: hwclock/rtc.c:244
#, c-format
msgid "ioctl() to %s to turn off update interrupts failed"
msgstr ""
"Non riuscita la disattivazione degli interrupt d'aggiornamento attraverso "
"ioctl() su %s"
-#: hwclock/rtc.c:234
+#: hwclock/rtc.c:247
#, c-format
msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
msgstr ""
"Non riuscita inaspettatamente l'attivazione degli interrupt d'aggiornametno "
"attraverso ioctl() su %s "
-#: hwclock/rtc.c:274 hwclock/rtc.c:358 hwclock/rtc.c:404
-#, c-format
-msgid "Unable to open %s"
-msgstr "Impossibile aprire %s"
-
-#: hwclock/rtc.c:300
+#: hwclock/rtc.c:306
#, c-format
msgid "ioctl() to %s to set the time failed.\n"
msgstr "Non riusciuta l'impostazione dell'ora attraverso ioctl() su %s.\n"
-#: hwclock/rtc.c:306
+#: hwclock/rtc.c:312
#, c-format
msgid "ioctl(%s) was successful.\n"
msgstr " ioctl(%s) ha funzionato.\n"
-#: hwclock/rtc.c:335
+#: hwclock/rtc.c:341
#, c-format
msgid "Open of %s failed"
msgstr "Non riuscita l'apertura di %s"
-#: hwclock/rtc.c:353 hwclock/rtc.c:399
+#: hwclock/rtc.c:359 hwclock/rtc.c:405
#, c-format
msgid ""
"To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
@@ -5614,12 +5840,17 @@ msgstr ""
"periferica 'rtc' di Linux attraverso il file speciale della periferica %s. "
"Questo file non esiste su questo sistema.\n"
-#: hwclock/rtc.c:365
+#: hwclock/rtc.c:364 hwclock/rtc.c:410
+#, c-format
+msgid "Unable to open %s"
+msgstr "Impossibile aprire %s"
+
+#: hwclock/rtc.c:371
#, c-format
msgid "ioctl(RTC_EPOCH_READ) to %s failed"
msgstr " Non riuscito ioctl(RTC_EPOCH_READ) su %s"
-#: hwclock/rtc.c:371
+#: hwclock/rtc.c:377
#, c-format
msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
msgstr "lettura di epoch %ld da %s con RTC_EPOCH_READ ioctl.\n"
@@ -5627,58 +5858,28 @@ msgstr "lettura di epoch %ld da %s con RTC_EPOCH_READ ioctl.\n"
#. kernel would not accept this epoch value
#. Hmm - bad habit, deciding not to do what the user asks
#. just because one believes that the kernel might not like it.
-#: hwclock/rtc.c:391
+#: hwclock/rtc.c:397
#, c-format
msgid "The epoch value may not be less than 1900. You requested %ld\n"
msgstr "Il valore epoch non può essere inferiore a 1900. Si è richiesto %ld\n"
-#: hwclock/rtc.c:409
+#: hwclock/rtc.c:415
#, c-format
msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
msgstr "impostazione epoch su %ld con RTC_EPOCH_SET ioctl su %s in corso.\n"
-#: hwclock/rtc.c:414
+#: hwclock/rtc.c:420
#, c-format
msgid ""
"The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
msgstr ""
"Il driver di periferica per il kernel per %s non ha RTC_EPOCH_SET ioctl.\n"
-#: hwclock/rtc.c:417
+#: hwclock/rtc.c:423
#, c-format
msgid "ioctl(RTC_EPOCH_SET) to %s failed"
msgstr "Non riuscito ioctl(RTC_EPOCH_SET) su %s"
-#: hwclock/shhopt.c:255 hwclock/shhopt.c:281
-#, c-format
-msgid "invalid number `%s'\n"
-msgstr "numero `%s' non valido\n"
-
-#: hwclock/shhopt.c:258 hwclock/shhopt.c:284
-#, c-format
-msgid "number `%s' to `%s' out of range\n"
-msgstr " numero `%s' su `%s' fuori intervallo\n"
-
-#: hwclock/shhopt.c:398
-#, c-format
-msgid "unrecognized option `%s'\n"
-msgstr "opzione `%s' non riconosciuta\n"
-
-#: hwclock/shhopt.c:411 hwclock/shhopt.c:449
-#, c-format
-msgid "option `%s' requires an argument\n"
-msgstr "l'opzione `%s' richiede un argomento\n"
-
-#: hwclock/shhopt.c:417
-#, c-format
-msgid "option `%s' doesn't allow an argument\n"
-msgstr "l'opzione `%s' non consente un argomento\n"
-
-#: hwclock/shhopt.c:439
-#, c-format
-msgid "unrecognized option `-%c'\n"
-msgstr "opzione `-%c' non riconosciuta\n"
-
#: login-utils/agetty.c:312
msgid "calling open_tty\n"
msgstr "chiamata a open_tty in corso\n"
@@ -6715,7 +6916,7 @@ msgstr "apertura file rc non riuscita\n"
msgid "fork failed\n"
msgstr "fork non riuscito\n"
-#: login-utils/simpleinit.c:512 text-utils/more.c:1705
+#: login-utils/simpleinit.c:512 text-utils/more.c:1706
msgid "exec failed\n"
msgstr "exec fallita\n"
@@ -7506,162 +7707,162 @@ msgstr "[mntent]: la linea %d in %s non è valida%s\n"
msgid "; rest of file ignored"
msgstr "; ignorato resto del file"
-#: mount/mount.c:379
+#: mount/mount.c:381
#, c-format
msgid "mount: according to mtab, %s is already mounted on %s"
msgstr "mount: in base a mtab, %s è già montato su %s"
-#: mount/mount.c:383
+#: mount/mount.c:385
#, c-format
msgid "mount: according to mtab, %s is mounted on %s"
msgstr "mount: in base a mtab, %s è montato su %s"
-#: mount/mount.c:404
+#: mount/mount.c:406
#, c-format
msgid "mount: can't open %s for writing: %s"
msgstr "mount: impossibile aprire %s in scrittura: %s"
-#: mount/mount.c:419 mount/mount.c:638
+#: mount/mount.c:421 mount/mount.c:640
#, c-format
msgid "mount: error writing %s: %s"
msgstr "mount: errore durante la scrittura di %s: %s"
-#: mount/mount.c:426
+#: mount/mount.c:428
#, c-format
msgid "mount: error changing mode of %s: %s"
msgstr "mount: errore durante il cambio di modalità di %s: %s"
-#: mount/mount.c:472
+#: mount/mount.c:474
#, c-format
msgid "%s looks like swapspace - not mounted"
msgstr "%s assomigla a swapspace - non montato"
-#: mount/mount.c:532
+#: mount/mount.c:534
msgid "mount failed"
msgstr "mount non riuscito"
-#: mount/mount.c:534
+#: mount/mount.c:536
#, c-format
msgid "mount: only root can mount %s on %s"
msgstr "mount: solamente root può montare %s su %s"
-#: mount/mount.c:562
+#: mount/mount.c:564
msgid "mount: loop device specified twice"
msgstr "mount: loop device specificato due volte"
-#: mount/mount.c:567
+#: mount/mount.c:569
msgid "mount: type specified twice"
msgstr "mount: tipo specificato due volte"
-#: mount/mount.c:579
+#: mount/mount.c:581
msgid "mount: skipping the setup of a loop device\n"
msgstr "mount: si ignora l'impostazione di un loop device\n"
-#: mount/mount.c:588
+#: mount/mount.c:590
#, c-format
msgid "mount: going to use the loop device %s\n"
msgstr "mount: si intende utilizzare il loop device %s\n"
-#: mount/mount.c:592
+#: mount/mount.c:594
msgid "mount: failed setting up loop device\n"
msgstr "mount: mancata impostazione del loop device\n"
-#: mount/mount.c:596
+#: mount/mount.c:598
msgid "mount: setup loop device successfully\n"
msgstr "mount: impostazione del loop device riuscita\n"
-#: mount/mount.c:633
+#: mount/mount.c:635
#, c-format
msgid "mount: can't open %s: %s"
msgstr "mount: impossibile aprire %s: %s"
-#: mount/mount.c:656
+#: mount/mount.c:658
#, fuzzy, c-format
msgid "mount: cannot open %s for setting speed"
msgstr "mount: impossibile aprire %s in scrittura: %s"
-#: mount/mount.c:659
+#: mount/mount.c:661
#, fuzzy, c-format
msgid "mount: cannot set speed: %s"
msgstr "mount: impossibile aprire %s: %s"
-#: mount/mount.c:720 mount/mount.c:1265
+#: mount/mount.c:722 mount/mount.c:1295
#, c-format
msgid "mount: cannot fork: %s"
msgstr "mount: impossibile effettuare il fork: %s"
-#: mount/mount.c:800
+#: mount/mount.c:802
msgid "mount: this version was compiled without support for the type `nfs'"
msgstr ""
"mount: questa versione è stata compilata senza supporto per il tipo `nfs'"
-#: mount/mount.c:839
+#: mount/mount.c:841
msgid "mount: failed with nfs mount version 4, trying 3..\n"
msgstr ""
-#: mount/mount.c:850
+#: mount/mount.c:852
msgid ""
"mount: I could not determine the filesystem type, and none was specified"
msgstr ""
"mount: impossibile determinare il tipo di filesystem, e non è stato "
"specificato nessuno"
-#: mount/mount.c:853
+#: mount/mount.c:855
msgid "mount: you must specify the filesystem type"
msgstr "mount: si deve specificare il tipo di filesystem"
#. should not happen
-#: mount/mount.c:856
+#: mount/mount.c:858
msgid "mount: mount failed"
msgstr "mount: mount non riuscito"
-#: mount/mount.c:862 mount/mount.c:897
+#: mount/mount.c:864 mount/mount.c:899
#, c-format
msgid "mount: mount point %s is not a directory"
msgstr "mount: il mount point di %s non è una directory"
-#: mount/mount.c:864
+#: mount/mount.c:866
msgid "mount: permission denied"
msgstr "mount: autorizzazione negata"
-#: mount/mount.c:866
+#: mount/mount.c:868
msgid "mount: must be superuser to use mount"
msgstr "mount: bisogna essere superuser per utilizzare mount"
#. heuristic: if /proc/version exists, then probably proc is mounted
#. proc mounted?
-#: mount/mount.c:870 mount/mount.c:874
+#: mount/mount.c:872 mount/mount.c:876
#, c-format
msgid "mount: %s is busy"
msgstr "mount: %s è occupato"
#. no
#. yes, don't mention it
-#: mount/mount.c:876
+#: mount/mount.c:878
msgid "mount: proc already mounted"
msgstr "mount: proc già montato"
-#: mount/mount.c:878
+#: mount/mount.c:880
#, c-format
msgid "mount: %s already mounted or %s busy"
msgstr "mount: %s già montato o %s occupato"
-#: mount/mount.c:884
+#: mount/mount.c:886
#, c-format
msgid "mount: mount point %s does not exist"
msgstr "mount: il mount point %s non esiste"
-#: mount/mount.c:886
+#: mount/mount.c:888
#, c-format
msgid "mount: mount point %s is a symbolic link to nowhere"
msgstr "mount: il mount point %s è un link simbolico a nulla"
-#: mount/mount.c:889
+#: mount/mount.c:891
#, c-format
msgid "mount: special device %s does not exist"
msgstr "mount: il device speciale %s non esiste"
-#: mount/mount.c:899
+#: mount/mount.c:901
#, c-format
msgid ""
"mount: special device %s does not exist\n"
@@ -7670,12 +7871,12 @@ msgstr ""
"mount: il device speciale %s non esiste\n"
" (un prefisso di percorso non è una directory)\n"
-#: mount/mount.c:912
+#: mount/mount.c:914
#, c-format
msgid "mount: %s not mounted already, or bad option"
msgstr "mount: %s non ancora montato, oppure l'opzione non è valida"
-#: mount/mount.c:914
+#: mount/mount.c:916
#, c-format
msgid ""
"mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -7684,47 +7885,47 @@ msgstr ""
"mount: tipo fs errato, opzione non valida, superblocco su %s danneggiato,\n"
" o troppi file system montati"
-#: mount/mount.c:948
+#: mount/mount.c:950
msgid "mount table full"
msgstr "mount table piena"
-#: mount/mount.c:950
+#: mount/mount.c:952
#, c-format
msgid "mount: %s: can't read superblock"
msgstr "mount: %s: impossibile leggere il superblocco"
-#: mount/mount.c:954
+#: mount/mount.c:956
#, fuzzy, c-format
msgid "mount: %s: unknown device"
msgstr "umount: %s: dispositivo di blocchi non valido"
-#: mount/mount.c:959
+#: mount/mount.c:961
#, c-format
msgid "mount: fs type %s not supported by kernel"
msgstr "mount: fs di tipo %s non supportato dal kernel"
-#: mount/mount.c:971
+#: mount/mount.c:973
#, c-format
msgid "mount: probably you meant %s"
msgstr "mount: probabilmente si intende %s"
-#: mount/mount.c:973
+#: mount/mount.c:975
msgid "mount: maybe you meant iso9660 ?"
msgstr "mount: forse si intendeva iso9660 ?"
-#: mount/mount.c:976
+#: mount/mount.c:978
#, c-format
msgid "mount: %s has wrong device number or fs type %s not supported"
msgstr ""
"mount: %s ha un numero device errato o il fs di tipo %s non è supportato"
#. strange ...
-#: mount/mount.c:982
+#: mount/mount.c:984
#, c-format
msgid "mount: %s is not a block device, and stat fails?"
msgstr "mount: %s non è un dispositivo di blocchi e lo stat non è riuscito?"
-#: mount/mount.c:984
+#: mount/mount.c:986
#, c-format
msgid ""
"mount: the kernel does not recognize %s as a block device\n"
@@ -7733,95 +7934,101 @@ msgstr ""
"mount: il kernel non riconosce %s come un dispositivo di blocchi\n"
" (forse `insmod driver'?)"
-#: mount/mount.c:987
+#: mount/mount.c:989
#, c-format
msgid "mount: %s is not a block device (maybe try `-o loop'?)"
msgstr "mount: %s non è un dispositivo di blocchi (magari tentare `-o loop'?)"
-#: mount/mount.c:990
+#: mount/mount.c:992
#, c-format
msgid "mount: %s is not a block device"
msgstr "mount: %s non è un dispositivo di blocchi"
-#: mount/mount.c:993
+#: mount/mount.c:995
#, c-format
msgid "mount: %s is not a valid block device"
msgstr "mount: %s non un dispositivo di blocchi valido"
#. pre-linux 1.1.38, 1.1.41 and later
#. linux 1.1.38 and later
-#: mount/mount.c:996
+#: mount/mount.c:998
msgid "block device "
msgstr " dispositivo di blocchi"
-#: mount/mount.c:998
+#: mount/mount.c:1000
#, fuzzy, c-format
msgid "mount: cannot mount %s%s read-only"
msgstr "umount: impossibile rimontare %s di sola lettura\n"
-#: mount/mount.c:1002
+#: mount/mount.c:1004
#, fuzzy, c-format
msgid "mount: %s%s is write-protected but explicit `-w' flag given"
msgstr ""
"mount: %s%s è protetto da scrittura, montaggio in sola lettura in corso"
-#: mount/mount.c:1018
+#: mount/mount.c:1020
#, c-format
msgid "mount: %s%s is write-protected, mounting read-only"
msgstr ""
"mount: %s%s è protetto da scrittura, montaggio in sola lettura in corso"
-#: mount/mount.c:1104
+#: mount/mount.c:1107
#, c-format
msgid "mount: the label %s occurs on both %s and %s\n"
msgstr ""
-#: mount/mount.c:1108
+#: mount/mount.c:1111
#, fuzzy, c-format
msgid "mount: %s duplicate - not mounted"
msgstr "umount: %s: non montato"
-#: mount/mount.c:1118
+#: mount/mount.c:1121
#, fuzzy, c-format
msgid "mount: going to mount %s by %s\n"
msgstr "mount: considerare il montaggio di %s con %s\n"
-#: mount/mount.c:1119
+#: mount/mount.c:1122
msgid "UUID"
msgstr "UUID"
-#: mount/mount.c:1119
+#: mount/mount.c:1122
msgid "label"
msgstr "etichetta"
-#: mount/mount.c:1121 mount/mount.c:1521
+#: mount/mount.c:1124 mount/mount.c:1555
msgid "mount: no such partition found"
msgstr "mount: non si è trovata tale partizione"
-#: mount/mount.c:1129
+#: mount/mount.c:1132
msgid "mount: no type was given - I'll assume nfs because of the colon\n"
msgstr ""
"mount: non è stato dato il tipo - Si presume nfs perché ci sono i due punti\n"
+#: mount/mount.c:1137
+#, fuzzy
+msgid "mount: no type was given - I'll assume smb because of the // prefix\n"
+msgstr ""
+"mount: non è stato dato il tipo - Si presume nfs perché ci sono i due punti\n"
+
#.
#. * Retry in the background.
#.
-#: mount/mount.c:1145
+#: mount/mount.c:1153
#, c-format
msgid "mount: backgrounding \"%s\"\n"
msgstr "mount: esecuzione in background di \"%s\"\n"
-#: mount/mount.c:1156
+#: mount/mount.c:1164
#, c-format
msgid "mount: giving up \"%s\"\n"
msgstr "mount: termina \"%s\"\n"
-#: mount/mount.c:1216
+#: mount/mount.c:1240
#, c-format
msgid "mount: %s already mounted on %s\n"
msgstr "mount: %s già montato su %s\n"
-#: mount/mount.c:1335
+#: mount/mount.c:1369
msgid ""
"Usage: mount -V : print version\n"
" mount -h : print this help\n"
@@ -7846,74 +8053,74 @@ msgid ""
"For many more details, say man 8 mount .\n"
msgstr ""
-#: mount/mount.c:1497
+#: mount/mount.c:1531
msgid "mount: only root can do that"
msgstr "mount: è possibile solo per root"
-#: mount/mount.c:1502
+#: mount/mount.c:1536
#, c-format
msgid "mount: no %s found - creating it..\n"
msgstr "mount: nessun %s trovato - creazione in corso..\n"
-#: mount/mount.c:1516
+#: mount/mount.c:1550
#, c-format
msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
msgstr ""
-#: mount/mount.c:1523
+#: mount/mount.c:1557
#, c-format
msgid "mount: mounting %s\n"
msgstr "mount: mount di %s in corso\n"
-#: mount/mount.c:1532
+#: mount/mount.c:1566
msgid "nothing was mounted"
msgstr ""
-#: mount/mount.c:1547
+#: mount/mount.c:1581
#, c-format
msgid "mount: cannot find %s in %s"
msgstr "mount: impossibile trovare %s in %s"
-#: mount/mount.c:1562
+#: mount/mount.c:1596
#, c-format
msgid "mount: can't find %s in %s or %s"
msgstr "mount: impossibile trovare %s in %s o %s"
-#: mount/mount_by_label.c:169
+#: mount/mount_by_label.c:199
#, fuzzy, c-format
msgid ""
"mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
msgstr "mount: impossibile aprire %s - si sta utilizzando al suo posto %s\n"
-#: mount/mount_by_label.c:295
+#: mount/mount_by_label.c:325
msgid "mount: bad UUID"
msgstr "mount: UUID non valido"
-#: mount/mount_guess_fstype.c:487
+#: mount/mount_guess_fstype.c:482
#, fuzzy
msgid "mount: error while guessing filesystem type\n"
msgstr "mount: si deve specificare il tipo di filesystem"
-#: mount/mount_guess_fstype.c:496
+#: mount/mount_guess_fstype.c:491
#, c-format
msgid "mount: you didn't specify a filesystem type for %s\n"
msgstr "mount: non si è specificato un tipo di filesystem per %s\n"
-#: mount/mount_guess_fstype.c:499
+#: mount/mount_guess_fstype.c:494
#, c-format
msgid " I will try all types mentioned in %s or %s\n"
msgstr " Proverò tutti i tipi citati in %s o %s\n"
-#: mount/mount_guess_fstype.c:502
+#: mount/mount_guess_fstype.c:497
msgid " and it looks like this is swapspace\n"
msgstr " e sembra che questo sia swapspace\n"
-#: mount/mount_guess_fstype.c:504
+#: mount/mount_guess_fstype.c:499
#, c-format
msgid " I will try type %s\n"
msgstr " Proverò il tipo %s\n"
-#: mount/mount_guess_fstype.c:592
+#: mount/mount_guess_fstype.c:587
#, c-format
msgid "Trying %s\n"
msgstr "Prova di %s in corso\n"
@@ -8007,7 +8214,7 @@ msgstr "valore riportato di stato nfs sconosciuto: %d"
msgid "bug in xstrndup call"
msgstr "bug in chiamata xstrndup"
-#: mount/swapon.c:51
+#: mount/swapon.c:56
#, c-format
msgid ""
"usage: %s [-hV]\n"
@@ -8020,29 +8227,46 @@ msgstr ""
" %s [-v] [-p priority] special ...\n"
" %s [-s]\n"
-#: mount/swapon.c:88
+#: mount/swapon.c:66
+#, fuzzy, c-format
+msgid ""
+"usage: %s [-hV]\n"
+" %s -a [-v]\n"
+" %s [-v] special ...\n"
+msgstr ""
+"utilizzo: %s [-hV]\n"
+" %s -a [-v]\n"
+" %s [-v] [-p priority] special ...\n"
+" %s [-s]\n"
+
+#: mount/swapon.c:170 mount/swapon.c:234
#, c-format
msgid "%s on %s\n"
msgstr "%s su %s\n"
-#: mount/swapon.c:93
+#: mount/swapon.c:174
#, c-format
msgid "swapon: cannot stat %s: %s\n"
msgstr "swapon: impossibile effettuare stat di %s: %s\n"
-#: mount/swapon.c:105
+#: mount/swapon.c:185
#, fuzzy, c-format
msgid "swapon: warning: %s has insecure permissions %04o, %04o suggested\n"
msgstr ""
"swapon: attenzione: %s ha le autorizzazioni non sicure %04o, 0600 è "
"suggerito\n"
-#: mount/swapon.c:115
+#: mount/swapon.c:197
#, c-format
msgid "swapon: Skipping file %s - it appears to have holes.\n"
msgstr "swapon: sto ignorando il file %s - sembra avere dei buchi.\n"
-#: mount/swapon.c:222
+#: mount/swapon.c:240
+#, fuzzy
+msgid "Not superuser.\n"
+msgstr "Non impostato\n"
+
+#: mount/swapon.c:298 mount/swapon.c:386
#, c-format
msgid "%s: cannot open %s: %s\n"
msgstr "%s: impossibile aprire %s: %s\n"
@@ -8415,28 +8639,28 @@ msgstr "%s su %s\n"
msgid "%s: unknown argument: %s\n"
msgstr "%s: segnale sconosciuto %s\n"
-#: sys-utils/ipcs.c:122
+#: sys-utils/ipcs.c:121
#, c-format
msgid "usage : %s -asmq -tclup \n"
msgstr "utilizzo : %s -asmq -tclup \n"
-#: sys-utils/ipcs.c:123
+#: sys-utils/ipcs.c:122
#, c-format
msgid "\t%s [-s -m -q] -i id\n"
msgstr "\t%s [-s -m -q] -i id\n"
-#: sys-utils/ipcs.c:124
+#: sys-utils/ipcs.c:123
#, c-format
msgid "\t%s -h for help.\n"
msgstr "\t%s -h per richiamare la guida.\n"
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:129
#, fuzzy, c-format
msgid ""
"%s provides information on ipc facilities for which you have read access.\n"
msgstr "%s fornisce informazioni sulle funzionalità ipc per"
-#: sys-utils/ipcs.c:132
+#: sys-utils/ipcs.c:131
msgid ""
"Resource Specification:\n"
"\t-m : shared_mem\n"
@@ -8446,7 +8670,7 @@ msgstr ""
"\t-m : shared_mem (mem_condiv)\n"
"\t-q : messaggi\n"
-#: sys-utils/ipcs.c:133
+#: sys-utils/ipcs.c:132
msgid ""
"\t-s : semaphores\n"
"\t-a : all (default)\n"
@@ -8454,7 +8678,7 @@ msgstr ""
"\t-s : semafori\n"
"\t-a : tutti (predefinito)\n"
-#: sys-utils/ipcs.c:134
+#: sys-utils/ipcs.c:133
msgid ""
"Output Format:\n"
"\t-t : time\n"
@@ -8466,7 +8690,7 @@ msgstr ""
"\t-p : pid\n"
"\t-c : creatore\n"
-#: sys-utils/ipcs.c:135
+#: sys-utils/ipcs.c:134
msgid ""
"\t-l : limits\n"
"\t-u : summary\n"
@@ -8474,377 +8698,377 @@ msgstr ""
"\t-l : limiti\n"
"\t-u : sommario\n"
-#: sys-utils/ipcs.c:136
+#: sys-utils/ipcs.c:135
msgid "-i id [-s -q -m] : details on resource identified by id\n"
msgstr "-i id [-s -q -m] : dettagli sulla risorsa identificata da id\n"
-#: sys-utils/ipcs.c:268
+#: sys-utils/ipcs.c:267
msgid "kernel not configured for shared memory\n"
msgstr "il kernel non è configurato per la condivisione della memoria\n"
-#: sys-utils/ipcs.c:274
+#: sys-utils/ipcs.c:273
msgid "------ Shared Memory Limits --------\n"
msgstr "------ Limiti della memoria condivisa --------\n"
#. glibc 2.1.3 and all earlier libc's have ints as fields
#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
-#: sys-utils/ipcs.c:279
+#: sys-utils/ipcs.c:278
#, fuzzy, c-format
msgid "max number of segments = %ld\n"
msgstr "numero massimo di segmenti = %d\n"
-#: sys-utils/ipcs.c:281
+#: sys-utils/ipcs.c:280
#, fuzzy, c-format
msgid "max seg size (kbytes) = %ld\n"
msgstr "dimensione max seg (kbyte) = %d\n"
-#: sys-utils/ipcs.c:283
+#: sys-utils/ipcs.c:282
#, fuzzy, c-format
msgid "max total shared memory (kbytes) = %ld\n"
msgstr "valore massimo totale di memoria condivisa (kbyte) = %d\n"
-#: sys-utils/ipcs.c:285
+#: sys-utils/ipcs.c:284
#, fuzzy, c-format
msgid "min seg size (bytes) = %ld\n"
msgstr "dimensione min seg (byte) = %d\n"
-#: sys-utils/ipcs.c:290
+#: sys-utils/ipcs.c:289
msgid "------ Shared Memory Status --------\n"
msgstr "------ stato della memoria condivisa --------\n"
-#: sys-utils/ipcs.c:291
+#: sys-utils/ipcs.c:290
#, c-format
msgid "segments allocated %d\n"
msgstr "segmenti allocati %d\n"
-#: sys-utils/ipcs.c:292
+#: sys-utils/ipcs.c:291
#, c-format
msgid "pages allocated %ld\n"
msgstr "pagine allocate %ld\n"
-#: sys-utils/ipcs.c:293
+#: sys-utils/ipcs.c:292
#, c-format
msgid "pages resident %ld\n"
msgstr "pagine residenti %ld\n"
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:293
#, c-format
msgid "pages swapped %ld\n"
msgstr "pagine scambiate (swapping) %ld\n"
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:294
#, c-format
msgid "Swap performance: %ld attempts\t %ld successes\n"
msgstr "Prestazione swap: %ld tentativi\t %ld riusciti\n"
-#: sys-utils/ipcs.c:300
+#: sys-utils/ipcs.c:299
msgid "------ Shared Memory Segment Creators/Owners --------\n"
msgstr "------ Segmento Mem. Condiv. Creatori/Propr.--------\n"
-#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:300 sys-utils/ipcs.c:417 sys-utils/ipcs.c:516
#, fuzzy, c-format
msgid "%-10s %-10s %-10s %-10s %-10s %-10s\n"
msgstr "%-10s%-10s%-10s%-10s%-10s%-10s\n"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:308 sys-utils/ipcs.c:315
-#: sys-utils/ipcs.c:321 sys-utils/ipcs.c:425
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:307 sys-utils/ipcs.c:314
+#: sys-utils/ipcs.c:320 sys-utils/ipcs.c:424
msgid "shmid"
msgstr "shmid"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:321 sys-utils/ipcs.c:419
-#: sys-utils/ipcs.c:434 sys-utils/ipcs.c:519 sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:320 sys-utils/ipcs.c:418
+#: sys-utils/ipcs.c:433 sys-utils/ipcs.c:517 sys-utils/ipcs.c:535
msgid "perms"
msgstr "perms"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:517
msgid "cuid"
msgstr "cuid"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:517
msgid "cgid"
msgstr "cgid"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:517
msgid "uid"
msgstr "uid"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:517
msgid "gid"
msgstr "gid"
-#: sys-utils/ipcs.c:306
+#: sys-utils/ipcs.c:305
msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
msgstr "------ Mem. Condiv. Conn./Sconn./Cambio Volte --------\n"
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:306
#, fuzzy, c-format
msgid "%-10s %-10s %-20s %-20s %-20s\n"
msgstr "%-10s%-10s %-20s%-20s%-20s\n"
-#: sys-utils/ipcs.c:308 sys-utils/ipcs.c:315 sys-utils/ipcs.c:321
-#: sys-utils/ipcs.c:425 sys-utils/ipcs.c:434 sys-utils/ipcs.c:525
-#: sys-utils/ipcs.c:531 sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:314 sys-utils/ipcs.c:320
+#: sys-utils/ipcs.c:424 sys-utils/ipcs.c:433 sys-utils/ipcs.c:523
+#: sys-utils/ipcs.c:529 sys-utils/ipcs.c:535
msgid "owner"
msgstr "proprietario"
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:307
msgid "attached"
msgstr "connesso"
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:307
msgid "detached"
msgstr "disconnesso"
-#: sys-utils/ipcs.c:309
+#: sys-utils/ipcs.c:308
msgid "changed"
msgstr "cambiato"
-#: sys-utils/ipcs.c:313
+#: sys-utils/ipcs.c:312
msgid "------ Shared Memory Creator/Last-op --------\n"
msgstr "------ Mem. Condiv. Creatore/Last-op--------\n"
-#: sys-utils/ipcs.c:314 sys-utils/ipcs.c:530
+#: sys-utils/ipcs.c:313 sys-utils/ipcs.c:528
#, fuzzy, c-format
msgid "%-10s %-10s %-10s %-10s\n"
msgstr "%-10s%-10s%-10s%-10s\n"
-#: sys-utils/ipcs.c:315
+#: sys-utils/ipcs.c:314
msgid "cpid"
msgstr "cpid"
-#: sys-utils/ipcs.c:315
+#: sys-utils/ipcs.c:314
msgid "lpid"
msgstr "lpid"
-#: sys-utils/ipcs.c:319
+#: sys-utils/ipcs.c:318
msgid "------ Shared Memory Segments --------\n"
msgstr "------ Segm. Memoria Condivisa --------\n"
-#: sys-utils/ipcs.c:320
+#: sys-utils/ipcs.c:319
#, fuzzy, c-format
msgid "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n"
msgstr "%-10s%-10s%-10s%-10s%-10s%-10s%-12s\n"
-#: sys-utils/ipcs.c:321 sys-utils/ipcs.c:434 sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:320 sys-utils/ipcs.c:433 sys-utils/ipcs.c:535
msgid "key"
msgstr "chiave"
-#: sys-utils/ipcs.c:321
+#: sys-utils/ipcs.c:320
msgid "bytes"
msgstr "byte"
-#: sys-utils/ipcs.c:322
+#: sys-utils/ipcs.c:321
msgid "nattch"
msgstr "nattch"
-#: sys-utils/ipcs.c:322 sys-utils/ipcs.c:435
+#: sys-utils/ipcs.c:321
msgid "status"
msgstr "stato"
-#: sys-utils/ipcs.c:343 sys-utils/ipcs.c:345 sys-utils/ipcs.c:347
-#: sys-utils/ipcs.c:456 sys-utils/ipcs.c:458 sys-utils/ipcs.c:558
-#: sys-utils/ipcs.c:560 sys-utils/ipcs.c:562 sys-utils/ipcs.c:615
-#: sys-utils/ipcs.c:617 sys-utils/ipcs.c:646 sys-utils/ipcs.c:648
-#: sys-utils/ipcs.c:650 sys-utils/ipcs.c:674
+#: sys-utils/ipcs.c:342 sys-utils/ipcs.c:344 sys-utils/ipcs.c:346
+#: sys-utils/ipcs.c:455 sys-utils/ipcs.c:457 sys-utils/ipcs.c:556
+#: sys-utils/ipcs.c:558 sys-utils/ipcs.c:560 sys-utils/ipcs.c:613
+#: sys-utils/ipcs.c:615 sys-utils/ipcs.c:644 sys-utils/ipcs.c:646
+#: sys-utils/ipcs.c:648 sys-utils/ipcs.c:672
msgid "Not set"
msgstr "Non impostato"
-#: sys-utils/ipcs.c:372
+#: sys-utils/ipcs.c:371
msgid "dest"
msgstr "dest"
-#: sys-utils/ipcs.c:373
+#: sys-utils/ipcs.c:372
msgid "locked"
msgstr "bloccato"
-#: sys-utils/ipcs.c:393
+#: sys-utils/ipcs.c:392
msgid "kernel not configured for semaphores\n"
msgstr "kernel non configurato per i semafori\n"
-#: sys-utils/ipcs.c:399
+#: sys-utils/ipcs.c:398
msgid "------ Semaphore Limits --------\n"
msgstr "------ Limiti di semaforo --------\n"
-#: sys-utils/ipcs.c:403
+#: sys-utils/ipcs.c:402
#, c-format
msgid "max number of arrays = %d\n"
msgstr "numero max di matrici = %d\n"
-#: sys-utils/ipcs.c:404
+#: sys-utils/ipcs.c:403
#, c-format
msgid "max semaphores per array = %d\n"
msgstr "numero max di semafori per matrice = %d\n"
-#: sys-utils/ipcs.c:405
+#: sys-utils/ipcs.c:404
#, c-format
msgid "max semaphores system wide = %d\n"
msgstr "numero max di semafori su tutto il sistema = %d\n"
-#: sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:405
#, c-format
msgid "max ops per semop call = %d\n"
msgstr "numero max opz. per chiamata semop = %d\n"
-#: sys-utils/ipcs.c:407
+#: sys-utils/ipcs.c:406
#, c-format
msgid "semaphore max value = %d\n"
msgstr "valore max del semaforo = %d\n"
-#: sys-utils/ipcs.c:411
+#: sys-utils/ipcs.c:410
msgid "------ Semaphore Status --------\n"
msgstr "------ Stato del semaforo --------\n"
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:411
#, c-format
msgid "used arrays = %d\n"
msgstr "matrici utilizzate = %d\n"
-#: sys-utils/ipcs.c:413
+#: sys-utils/ipcs.c:412
#, c-format
msgid "allocated semaphores = %d\n"
msgstr "semafori allocati = %d\n"
-#: sys-utils/ipcs.c:417
+#: sys-utils/ipcs.c:416
msgid "------ Semaphore Arrays Creators/Owners --------\n"
msgstr "------ Matrice di Semaf. Creatori/Propr. --------\n"
-#: sys-utils/ipcs.c:419 sys-utils/ipcs.c:434
+#: sys-utils/ipcs.c:418 sys-utils/ipcs.c:433
msgid "semid"
msgstr "semid"
-#: sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:422
msgid "------ Shared Memory Operation/Change Times --------\n"
msgstr "------ Mem. Condivisa Operazione/Modif. Volte --------\n"
-#: sys-utils/ipcs.c:424
+#: sys-utils/ipcs.c:423
#, fuzzy, c-format
msgid "%-8s %-10s %-26.24s %-26.24s\n"
msgstr "%-8s%-10s %-26.24s %-26.24s\n"
-#: sys-utils/ipcs.c:425
+#: sys-utils/ipcs.c:424
msgid "last-op"
msgstr "last-op"
-#: sys-utils/ipcs.c:425
+#: sys-utils/ipcs.c:424
msgid "last-changed"
msgstr "ultima-modifica"
-#: sys-utils/ipcs.c:432
+#: sys-utils/ipcs.c:431
msgid "------ Semaphore Arrays --------\n"
msgstr "------ Matrici semafori --------\n"
-#: sys-utils/ipcs.c:433
+#: sys-utils/ipcs.c:432 sys-utils/ipcs.c:675
#, fuzzy, c-format
-msgid "%-10s %-10s %-10s %-10s %-10s %-12s\n"
-msgstr "%-10s%-10s%-10s%-10s%-10s%-12s\n"
+msgid "%-10s %-10s %-10s %-10s %-10s\n"
+msgstr "%-10s%-10s%-10s%-10s%-10s\n"
-#: sys-utils/ipcs.c:435
+#: sys-utils/ipcs.c:434
msgid "nsems"
msgstr "nsems"
-#: sys-utils/ipcs.c:495
+#: sys-utils/ipcs.c:493
#, fuzzy
msgid "kernel not configured for message queues\n"
msgstr "kernel non configurato per i semafori\n"
-#: sys-utils/ipcs.c:503
+#: sys-utils/ipcs.c:501
msgid "------ Messages: Limits --------\n"
msgstr "------ Messaggi: limiti --------\n"
-#: sys-utils/ipcs.c:504
+#: sys-utils/ipcs.c:502
#, c-format
msgid "max queues system wide = %d\n"
msgstr "numero max di code su tutto il sistema = %d\n"
-#: sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:503
#, c-format
msgid "max size of message (bytes) = %d\n"
msgstr "dimensione max del messaggio (byte) = %d\n"
-#: sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:504
#, c-format
msgid "default max size of queue (bytes) = %d\n"
msgstr "dimensione massima predefinita della coda (byte) = %d\n"
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:508
msgid "------ Messages: Status --------\n"
msgstr "------ Messaggi: stato --------\n"
-#: sys-utils/ipcs.c:511
+#: sys-utils/ipcs.c:509
#, c-format
msgid "allocated queues = %d\n"
msgstr "code allocate = %d\n"
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:510
#, c-format
msgid "used headers = %d\n"
msgstr "intestazioni utilizzate = %d\n"
-#: sys-utils/ipcs.c:513
+#: sys-utils/ipcs.c:511
#, c-format
msgid "used space = %d bytes\n"
msgstr "spazio utilizzato = %d byte\n"
-#: sys-utils/ipcs.c:517
+#: sys-utils/ipcs.c:515
msgid "------ Message Queues: Creators/Owners --------\n"
msgstr "------ Code messaggi: Creatori/Proprietari --------\n"
-#: sys-utils/ipcs.c:519 sys-utils/ipcs.c:525 sys-utils/ipcs.c:531
-#: sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:517 sys-utils/ipcs.c:523 sys-utils/ipcs.c:529
+#: sys-utils/ipcs.c:535
msgid "msqid"
msgstr "msqid"
-#: sys-utils/ipcs.c:523
+#: sys-utils/ipcs.c:521
msgid "------ Message Queues Send/Recv/Change Times --------\n"
msgstr "------ Code messaggi Inv./Ric./Modif. Volte--------\n"
-#: sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:522
#, fuzzy, c-format
msgid "%-8s %-10s %-20s %-20s %-20s\n"
msgstr "%-8s%-10s %-20s%-20s%-20s\n"
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:523
msgid "send"
msgstr "invio"
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:523
msgid "recv"
msgstr "ricez."
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:523
msgid "change"
msgstr "modifica"
-#: sys-utils/ipcs.c:529
+#: sys-utils/ipcs.c:527
msgid "------ Message Queues PIDs --------\n"
msgstr "------ Code Messaggi PID --------\n"
-#: sys-utils/ipcs.c:531
+#: sys-utils/ipcs.c:529
msgid "lspid"
msgstr "lspid"
-#: sys-utils/ipcs.c:531
+#: sys-utils/ipcs.c:529
msgid "lrpid"
msgstr "lrpid"
-#: sys-utils/ipcs.c:535
+#: sys-utils/ipcs.c:533
msgid "------ Message Queues --------\n"
msgstr "------ Code messaggi --------\n"
-#: sys-utils/ipcs.c:536
+#: sys-utils/ipcs.c:534
#, fuzzy, c-format
msgid "%-10s %-10s %-10s %-10s %-12s %-12s\n"
msgstr "%-10s%-10s%-10s%-10s%-12s%-12s\n"
-#: sys-utils/ipcs.c:538
+#: sys-utils/ipcs.c:536
msgid "used-bytes"
msgstr "byte utilizzati"
-#: sys-utils/ipcs.c:538
+#: sys-utils/ipcs.c:536
msgid "messages"
msgstr "messaggi"
-#: sys-utils/ipcs.c:606
+#: sys-utils/ipcs.c:604
#, c-format
msgid ""
"\n"
@@ -8853,37 +9077,37 @@ msgstr ""
"\n"
"Segmento memoria condivisa shmid=%d\n"
-#: sys-utils/ipcs.c:607
+#: sys-utils/ipcs.c:605
#, c-format
msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
-#: sys-utils/ipcs.c:609
+#: sys-utils/ipcs.c:607
#, c-format
msgid "mode=%#o\taccess_perms=%#o\n"
msgstr "mode=%#o\taccess_perms=%#o\n"
-#: sys-utils/ipcs.c:611
+#: sys-utils/ipcs.c:609
#, fuzzy, c-format
msgid "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n"
msgstr "byte=%d\tlpid=%d\tcpid=%d\tnattch=%d\n"
-#: sys-utils/ipcs.c:614
+#: sys-utils/ipcs.c:612
#, fuzzy, c-format
msgid "att_time=%-26.24s\n"
msgstr "att_time=%s"
-#: sys-utils/ipcs.c:616
+#: sys-utils/ipcs.c:614
#, fuzzy, c-format
msgid "det_time=%-26.24s\n"
msgstr "det_time=%s"
-#: sys-utils/ipcs.c:618 sys-utils/ipcs.c:649
+#: sys-utils/ipcs.c:616 sys-utils/ipcs.c:647
#, fuzzy, c-format
msgid "change_time=%-26.24s\n"
msgstr "change_time=%s"
-#: sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:631
#, c-format
msgid ""
"\n"
@@ -8892,27 +9116,27 @@ msgstr ""
"\n"
"Coda di messaggi msqid=%d\n"
-#: sys-utils/ipcs.c:634
+#: sys-utils/ipcs.c:632
#, c-format
msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
-#: sys-utils/ipcs.c:636
+#: sys-utils/ipcs.c:634
#, fuzzy, c-format
msgid "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
msgstr "cbytes=%d\tqbytes=%d\tqnum=%d\tlspid=%d\tlrpid=%d\n"
-#: sys-utils/ipcs.c:645
+#: sys-utils/ipcs.c:643
#, fuzzy, c-format
msgid "send_time=%-26.24s\n"
msgstr "det_time=%s"
-#: sys-utils/ipcs.c:647
+#: sys-utils/ipcs.c:645
#, c-format
msgid "rcv_time=%-26.24s\n"
msgstr ""
-#: sys-utils/ipcs.c:667
+#: sys-utils/ipcs.c:665
#, c-format
msgid ""
"\n"
@@ -8921,53 +9145,48 @@ msgstr ""
"\n"
"matrice semafori semid=%d\n"
-#: sys-utils/ipcs.c:668
+#: sys-utils/ipcs.c:666
#, c-format
msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
msgstr "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
-#: sys-utils/ipcs.c:670
+#: sys-utils/ipcs.c:668
#, c-format
msgid "mode=%#o, access_perms=%#o\n"
msgstr "modalità=%#o, access_perms=%#o\n"
-#: sys-utils/ipcs.c:672
+#: sys-utils/ipcs.c:670
#, fuzzy, c-format
msgid "nsems = %ld\n"
msgstr "nsems = %d\n"
-#: sys-utils/ipcs.c:673
+#: sys-utils/ipcs.c:671
#, fuzzy, c-format
msgid "otime = %-26.24s\n"
msgstr "otime = %s"
-#: sys-utils/ipcs.c:675
+#: sys-utils/ipcs.c:673
#, fuzzy, c-format
msgid "ctime = %-26.24s\n"
msgstr "ctime = %s"
-#: sys-utils/ipcs.c:677
-#, fuzzy, c-format
-msgid "%-10s %-10s %-10s %-10s %-10s\n"
-msgstr "%-10s%-10s%-10s%-10s%-10s\n"
-
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "semnum"
msgstr "semnum"
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "value"
msgstr "valore"
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "ncount"
msgstr "ncount"
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "zcount"
msgstr "zcount"
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "pid"
msgstr "pid"
@@ -9220,11 +9439,11 @@ msgstr "-- linea già svuotata"
msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
msgstr "utilizzo: %s [ - ] [ -2 ] [ file ... ]\n"
-#: text-utils/column.c:298
+#: text-utils/column.c:297
msgid "line too long"
msgstr "linea troppo lunga"
-#: text-utils/column.c:375
+#: text-utils/column.c:374
msgid "usage: column [-tx] [-c columns] [file ...]\n"
msgstr "utilizzo: column [-tx] [-c columns] [file ...]\n"
@@ -9317,33 +9536,33 @@ msgstr ""
msgid "Can't open help file"
msgstr "Impossibile aprire il file guida"
-#: text-utils/more.c:1442 text-utils/more.c:1446
+#: text-utils/more.c:1442 text-utils/more.c:1447
msgid "[Press 'h' for instructions.]"
msgstr "[Premere 'h' per visualizzare le istruzioni.]"
-#: text-utils/more.c:1480
+#: text-utils/more.c:1481
#, c-format
msgid "\"%s\" line %d"
msgstr "\"%s\" linea %d"
-#: text-utils/more.c:1482
+#: text-utils/more.c:1483
#, c-format
msgid "[Not a file] line %d"
msgstr "[Non un file] linea %d"
-#: text-utils/more.c:1566
+#: text-utils/more.c:1567
msgid " Overflow\n"
msgstr " Overflow\n"
-#: text-utils/more.c:1613
+#: text-utils/more.c:1614
msgid "...skipping\n"
msgstr "...ignora\n"
-#: text-utils/more.c:1643
+#: text-utils/more.c:1644
msgid "Regular expression botch"
msgstr "Errore nell'espressione regolare"
-#: text-utils/more.c:1655
+#: text-utils/more.c:1656
msgid ""
"\n"
"Pattern not found\n"
@@ -9351,15 +9570,15 @@ msgstr ""
"\n"
"Pattern non trovato\n"
-#: text-utils/more.c:1658
+#: text-utils/more.c:1659 text-utils/pg.c:1134 text-utils/pg.c:1285
msgid "Pattern not found"
msgstr "Pattern non trovato"
-#: text-utils/more.c:1719
+#: text-utils/more.c:1720
msgid "can't fork\n"
msgstr "impossibile effettuare fork\n"
-#: text-utils/more.c:1758
+#: text-utils/more.c:1759
msgid ""
"\n"
"...Skipping "
@@ -9367,21 +9586,21 @@ msgstr ""
"\n"
"...sto ignorando"
-#: text-utils/more.c:1763
+#: text-utils/more.c:1764
#, fuzzy
msgid "...Skipping to file "
msgstr "...Sto ignorando"
-#: text-utils/more.c:1765
+#: text-utils/more.c:1766
#, fuzzy
msgid "...Skipping back to file "
msgstr "ritorna al file"
-#: text-utils/more.c:2046
+#: text-utils/more.c:2047
msgid "Line too long"
msgstr "Linea troppo lunga"
-#: text-utils/more.c:2089
+#: text-utils/more.c:2090
msgid "No previous command to substitute for"
msgstr "Nessun comando precedente da sostituire"
@@ -9432,6 +9651,102 @@ msgstr "hexdump: formato non valido {%s}\n"
msgid "hexdump: bad conversion character %%%s.\n"
msgstr "hexdump: carattere di conversione non valido %%%s.\n"
+#: text-utils/pg.c:246
+#, c-format
+msgid ""
+"%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
+msgstr ""
+
+#: text-utils/pg.c:255
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- %s\n"
+msgstr "l'opzione `%s' richiede un argomento\n"
+
+#: text-utils/pg.c:263
+#, fuzzy, c-format
+msgid "%s: illegal option -- %s\n"
+msgstr "Tasto non valido"
+
+#: text-utils/pg.c:380
+#, fuzzy
+msgid "...skipping forward\n"
+msgstr "...ignora\n"
+
+#: text-utils/pg.c:382
+#, fuzzy
+msgid "...skipping backward\n"
+msgstr "...ignora\n"
+
+#: text-utils/pg.c:404
+#, fuzzy
+msgid "No next file"
+msgstr "(File successivo: %s)"
+
+#: text-utils/pg.c:408
+#, fuzzy
+msgid "No previous file"
+msgstr "Nessuna partizione definita\n"
+
+#: text-utils/pg.c:938
+#, fuzzy, c-format
+msgid "%s: Read error from %s file\n"
+msgstr "errore di scrittura su %s\n"
+
+#.
+#. * Most likely '\0' in input.
+#.
+#: text-utils/pg.c:944
+#, c-format
+msgid "%s: Unexpected EOF in %s file\n"
+msgstr ""
+
+#: text-utils/pg.c:947
+#, fuzzy, c-format
+msgid "%s: Unknown error in %s file\n"
+msgstr "errore di scrittura su %s\n"
+
+#: text-utils/pg.c:1042
+#, fuzzy, c-format
+msgid "%s: Cannot create tempfile\n"
+msgstr "%s: impossibile leggere il file temporaneo.\n"
+
+#: text-utils/pg.c:1051 text-utils/pg.c:1226
+#, fuzzy
+msgid "RE error: "
+msgstr ", errore"
+
+#: text-utils/pg.c:1208
+msgid "(EOF)"
+msgstr ""
+
+#: text-utils/pg.c:1234
+msgid "No remembered search string"
+msgstr ""
+
+#: text-utils/pg.c:1317
+#, fuzzy
+msgid "Cannot open "
+msgstr "Impossibile aprire %s\n"
+
+#: text-utils/pg.c:1365
+#, fuzzy
+msgid "saved"
+msgstr "invio"
+
+#: text-utils/pg.c:1472
+msgid ": !command not allowed in rflag mode.\n"
+msgstr ""
+
+#: text-utils/pg.c:1504
+#, fuzzy
+msgid "fork() failed, try again later\n"
+msgstr "Password *NON* modificata. Riprovare successivamente.\n"
+
+#: text-utils/pg.c:1709
+#, fuzzy
+msgid "(Next file: "
+msgstr "(File successivo: %s)"
+
#: text-utils/rev.c:113
msgid "Unable to allocate bufferspace\n"
msgstr "Impossibile allocare lo spazio buffer\n"
@@ -9466,6 +9781,28 @@ msgstr "Linea di input troppo lunga.\n"
msgid "Out of memory when growing buffer.\n"
msgstr "Memoria insufficiente quando si amplia il buffer.\n"
+#~ msgid "invalid number `%s'\n"
+#~ msgstr "numero `%s' non valido\n"
+
+#~ msgid "number `%s' to `%s' out of range\n"
+#~ msgstr " numero `%s' su `%s' fuori intervallo\n"
+
+#~ msgid "unrecognized option `%s'\n"
+#~ msgstr "opzione `%s' non riconosciuta\n"
+
+#~ msgid "option `%s' requires an argument\n"
+#~ msgstr "l'opzione `%s' richiede un argomento\n"
+
+#~ msgid "option `%s' doesn't allow an argument\n"
+#~ msgstr "l'opzione `%s' non consente un argomento\n"
+
+#~ msgid "unrecognized option `-%c'\n"
+#~ msgstr "opzione `-%c' non riconosciuta\n"
+
+#, fuzzy
+#~ msgid "%-10s %-10s %-10s %-10s %-10s %-12s\n"
+#~ msgstr "%-10s%-10s%-10s%-10s%-10s%-12s\n"
+
#~ msgid "umount: only %s can unmount %s from %s"
#~ msgstr "umount: solamente %s può smontare %s da %s"
@@ -9641,9 +9978,6 @@ msgstr "Memoria insufficiente quando si amplia il buffer.\n"
#~ msgid "not mounted anything"
#~ msgstr "niente è montato"
-#~ msgid "Not set\n"
-#~ msgstr "Non impostato\n"
-
#~ msgid "send_time=%srcv_time=%schange_time=%s"
#~ msgstr "send_time=%srcv_time=%schange_time=%s"
diff --git a/po/ja.po b/po/ja.po
index b799483b8..6ef3e9f1a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: util-linux 2.11n\n"
-"POT-Creation-Date: 2002-05-09 02:51+0200\n"
+"POT-Creation-Date: 2002-07-07 17:03+0200\n"
"PO-Revision-Date: 2001-12-11 22:43+0900\n"
"Last-Translator: Daisuke Yamashita <yamad@mb.infoweb.ne.jp>\n"
"Language-Team: Japanese <ja@li.org>\n"
@@ -110,28 +110,28 @@ msgstr "RO RA SSZ BSZ ³«»ÏSec ¥µ¥¤¥º ¥Ç¥Ð¥¤¥¹\n"
msgid "usage:\n"
msgstr "»È¤¤Êý:\n"
-#: disk-utils/fdformat.c:35
+#: disk-utils/fdformat.c:31
msgid "Formatting ... "
msgstr "¥Õ¥©¡¼¥Þ¥Ã¥È¤·¤Þ¤¹ ... "
-#: disk-utils/fdformat.c:53 disk-utils/fdformat.c:88
+#: disk-utils/fdformat.c:49 disk-utils/fdformat.c:84
msgid "done\n"
msgstr "½ªÎ»\n"
-#: disk-utils/fdformat.c:64
+#: disk-utils/fdformat.c:60
msgid "Verifying ... "
msgstr "¾È¹ç¤·¤Þ¤¹ ... "
-#: disk-utils/fdformat.c:75
+#: disk-utils/fdformat.c:71
msgid "Read: "
msgstr "Æɹþ: "
-#: disk-utils/fdformat.c:77
+#: disk-utils/fdformat.c:73
#, c-format
msgid "Problem reading cylinder %d, expected %d, read %d\n"
msgstr "Æɹþ¤ßÃæ¤ËÌäÂêȯÀ¸¡¢¥·¥ê¥ó¥À %d, %d ¤ÎȦ¤Ç¤¹¤¬ %d ¤òÆɹþ¤ß¤Þ¤·¤¿\n"
-#: disk-utils/fdformat.c:83
+#: disk-utils/fdformat.c:79
#, c-format
msgid ""
"bad data in cyl %d\n"
@@ -140,42 +140,148 @@ msgstr ""
"¥·¥ê¥ó¥À %d ¤ËÉÔÀµ¤Ê¥Ç¡¼¥¿\n"
"³¤±¤Þ¤¹ ... "
-#: disk-utils/fdformat.c:98
+#: disk-utils/fdformat.c:94
#, c-format
msgid "usage: %s [ -n ] device\n"
msgstr "»È¤¤Êý: %s [ -n ] ¥Ç¥Ð¥¤¥¹\n"
-#: disk-utils/fdformat.c:120 disk-utils/fsck.minix.c:1291
+#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1291
#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:55
-#: disk-utils/mkfs.minix.c:644 disk-utils/mkswap.c:457
-#: disk-utils/setfdprm.c:128 misc-utils/cal.c:246 misc-utils/ddate.c:181
-#: misc-utils/kill.c:188 misc-utils/rename.c:79 misc-utils/script.c:132
+#: disk-utils/mkfs.cramfs.c:665 disk-utils/mkfs.minix.c:644
+#: disk-utils/mkswap.c:457 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1170
+#: misc-utils/cal.c:246 misc-utils/ddate.c:181 misc-utils/kill.c:188
+#: misc-utils/rename.c:79 misc-utils/script.c:132
#, c-format
msgid "%s from %s\n"
msgstr "%s from %s\n"
-#: disk-utils/fdformat.c:134
-#, c-format
-msgid "%s: not a floppy device\n"
+#: disk-utils/fdformat.c:130
+#, fuzzy, c-format
+msgid "%s: not a block device\n"
msgstr "%s: ¥Õ¥í¥Ã¥Ô¡¼¥Ç¥Ð¥¤¥¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
-#: disk-utils/fdformat.c:143
+#: disk-utils/fdformat.c:140
msgid "Could not determine current format type"
msgstr "¸½ºß¤Î¥Õ¥©¡¼¥Þ¥Ã¥È¥¿¥¤¥×¤òÆÃÄê¤Ç¤­¤Þ¤»¤ó"
-#: disk-utils/fdformat.c:144
+#: disk-utils/fdformat.c:141
#, c-format
msgid "%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n"
msgstr "%sÌÌ, %d ¥È¥é¥Ã¥¯, %d ¥»¥¯¥¿/¥È¥é¥Ã¥¯¡£¹ç·×ÍÆÎÌ %d kB¡£\n"
-#: disk-utils/fdformat.c:145
+#: disk-utils/fdformat.c:142
msgid "Double"
msgstr "ξ"
-#: disk-utils/fdformat.c:145
+#: disk-utils/fdformat.c:142
msgid "Single"
msgstr "ÊÒ"
+#: disk-utils/fsck.cramfs.c:98
+#, c-format
+msgid ""
+"usage: %s [-hv] [-x dir] file\n"
+" -h print this help\n"
+" -x dir extract into dir\n"
+" -v be more verbose\n"
+" file file to test\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:191
+#, c-format
+msgid "%s: error %d while decompressing! %p(%d)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:243
+#, fuzzy, c-format
+msgid "%s: size error in symlink `%s'\n"
+msgstr "%s: %s ¤Ç seek ¥¨¥é¡¼\n"
+
+#: disk-utils/fsck.cramfs.c:258 disk-utils/fsck.cramfs.c:328
+#, c-format
+msgid " uncompressing block at %ld to %ld (%ld)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:287
+#, c-format
+msgid "%s: bogus mode on `%s' (%o)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:319
+#, fuzzy, c-format
+msgid " hole at %ld (%d)\n"
+msgstr "(%d, %d, %d) ¤Ç¤¢¤ë¤Ù¤­¤Ç¤¹\n"
+
+#: disk-utils/fsck.cramfs.c:337
+#, c-format
+msgid "%s: Non-block (%ld) bytes\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:343
+#, c-format
+msgid "%s: Non-size (%ld vs %ld) bytes\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:392
+#, c-format
+msgid "%s: invalid cramfs--bad path length\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:472
+#, fuzzy, c-format
+msgid "%s: compiled without -x support\n"
+msgstr "%s: minix v2 ¤Î¥µ¥Ý¡¼¥È¤Ä¤­¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
+
+#: disk-utils/fsck.cramfs.c:498
+#, c-format
+msgid "%s: warning--unable to determine filesystem size \n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:508
+#, fuzzy, c-format
+msgid "%s is not a block device or file\n"
+msgstr "%s: ¥Õ¥í¥Ã¥Ô¡¼¥Ç¥Ð¥¤¥¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
+
+#: disk-utils/fsck.cramfs.c:514 disk-utils/fsck.cramfs.c:549
+#, c-format
+msgid "%s: invalid cramfs--file length too short\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:541
+#, c-format
+msgid "%s: invalid cramfs--wrong magic\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:554
+#, c-format
+msgid "%s: warning--file length too long, padded image?\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:564
+#, fuzzy, c-format
+msgid "%s: invalid cramfs--crc error\n"
+msgstr "%s: ¥ª¥×¥·¥ç¥ó²òÀÏ¥¨¥é¡¼\n"
+
+#: disk-utils/fsck.cramfs.c:570
+#, c-format
+msgid "%s: warning--old cramfs image, no CRC\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:592
+#, c-format
+msgid "%s: invalid cramfs--bad superblock\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:608
+#, c-format
+msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:616
+#, c-format
+msgid "%s: invalid cramfs--invalid file data offset\n"
+msgstr ""
+
#: disk-utils/fsck.minix.c:200
#, c-format
msgid "Usage: %s [-larvsmf] /dev/name\n"
@@ -643,7 +749,7 @@ msgstr "i-¥Î¡¼¥É¤¬Â¿¤¹¤®¤Þ¤¹ - ºÇÂç 512 ¤Ç¤¹"
msgid "not enough space, need at least %lu blocks"
msgstr "Îΰ褬ÉÔ½½Ê¬¤Ç¤¹¡£ºÇÄã¤Ç¤â %lu ¥Ö¥í¥Ã¥¯É¬ÍפǤ¹"
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2057
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2069
#, c-format
msgid "Device: %s\n"
msgstr "¥Ç¥Ð¥¤¥¹: %s\n"
@@ -728,6 +834,130 @@ msgstr "%s: ¥á¥â¥ê¤¬Â­¤ê¤Þ¤»¤ó¡ª\n"
msgid "mkfs version %s (%s)\n"
msgstr "mkfs ¥Ð¡¼¥¸¥ç¥ó %s (%s)\n"
+#: disk-utils/mkfs.cramfs.c:49
+#, c-format
+msgid ""
+"usage: %s [-h] [-v] [-e edition] [-i file] [-n name] dirname outfile\n"
+" -h print this help\n"
+" -v be verbose\n"
+" -E make all warnings errors (non-zero exit status)\n"
+" -e edition set edition number (part of fsid)\n"
+" -i file insert a file image into the filesystem (requires >= 2.4.0)\n"
+" -n name set name of cramfs filesystem\n"
+" -p pad by %d bytes for boot code\n"
+" -s sort directory entries (old option, ignored)\n"
+" -z make explicit holes (requires >= 2.3.39)\n"
+" dirname root of the filesystem to be compressed\n"
+" outfile output file\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:213
+#, c-format
+msgid ""
+"Very long (%u bytes) filename `%s' found.\n"
+" Please increase MAX_INPUT_NAMELEN in mkcramfs.c and recompile. Exiting.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:371
+msgid "filesystem too big. Exiting.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:422
+msgid ""
+"Exceeded MAXENTRIES. Raise this value in mkcramfs.c and recompile. "
+"Exiting.\n"
+msgstr ""
+
+#. (I don't think this can happen with zlib.)
+#: disk-utils/mkfs.cramfs.c:520
+#, c-format
+msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:537
+#, c-format
+msgid "%6.2f%% (%+d bytes)\t%s\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:705
+#, c-format
+msgid ""
+"warning: guestimate of required size (upper bound) is %LdMB, but maximum "
+"image size is %uMB. We might die prematurely.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:747
+#, fuzzy, c-format
+msgid "Including: %s\n"
+msgstr "ÉÔÀµ¤Ê id: %s\n"
+
+#: disk-utils/mkfs.cramfs.c:753
+#, c-format
+msgid "Directory data: %d bytes\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:761
+#, c-format
+msgid "Everything: %d kilobytes\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:766
+#, fuzzy, c-format
+msgid "Super block: %d bytes\n"
+msgstr "»ÈÍѺѶõ´Ö = %d ¥Ð¥¤¥È\n"
+
+#: disk-utils/mkfs.cramfs.c:773
+#, c-format
+msgid "CRC: %x\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:778
+#, c-format
+msgid "not enough space allocated for ROM image (%Ld allocated, %d used)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:790
+#, c-format
+msgid "ROM image write failed (%d %d)\n"
+msgstr ""
+
+#. (These warnings used to come at the start, but they scroll off the
+#. screen too quickly.)
+#. (can't happen when reading from ext2fs)
+#. bytes, not chars: think UTF8.
+#: disk-utils/mkfs.cramfs.c:799
+#, fuzzy
+msgid "warning: filenames truncated to 255 bytes.\n"
+msgstr "·Ù¹ð: inode ¿ô¤¬Â礭¤¹¤®¤Þ¤¹¡£\n"
+
+#: disk-utils/mkfs.cramfs.c:802
+msgid "warning: files were skipped due to errors.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:805
+#, c-format
+msgid "warning: file sizes truncated to %luMB (minus 1 byte).\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:810
+#, c-format
+msgid ""
+"warning: uids truncated to %u bits. (This may be a security concern.)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:815
+#, c-format
+msgid ""
+"warning: gids truncated to %u bits. (This may be a security concern.)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:820
+#, c-format
+msgid ""
+"WARNING: device numbers truncated to %u bits. This almost certainly means\n"
+"that some device files will be wrong.\n"
+msgstr ""
+
#: disk-utils/mkfs.minix.c:181
#, c-format
msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
@@ -872,7 +1102,7 @@ msgid "too many bad pages"
msgstr "ÉÔÀµ¥Ú¡¼¥¸¤¬Â¿¤¹¤®¤Þ¤¹"
#: disk-utils/mkswap.c:359 misc-utils/look.c:182 misc-utils/setterm.c:1130
-#: text-utils/more.c:2062 text-utils/more.c:2073
+#: text-utils/more.c:2063 text-utils/more.c:2074
msgid "Out of memory"
msgstr "¥á¥â¥ê¤¬Â­¤ê¤Þ¤»¤ó"
@@ -1309,7 +1539,7 @@ msgstr " ÏÀÍýÎΰè"
#. odd flag on end
#. type id
#. type name
-#: fdisk/cfdisk.c:1996 fdisk/fdisk.c:1306 fdisk/fdisk.c:1594
+#: fdisk/cfdisk.c:1996 fdisk/fdisk.c:1318 fdisk/fdisk.c:1606
#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:690 fdisk/sfdisk.c:581
msgid "Unknown"
msgstr "ÉÔÌÀ"
@@ -1841,7 +2071,7 @@ msgstr ""
" ¤òʤ¤¹\n"
"\n"
-#: fdisk/fdisk.c:194
+#: fdisk/fdisk.c:195
msgid ""
"Usage: fdisk [-b SSZ] [-u] DISK Change partition table\n"
" fdisk -l [-b SSZ] [-u] DISK List partition table(s)\n"
@@ -1861,7 +2091,7 @@ msgstr ""
"-u: (¥·¥ê¥ó¥À¤ÎÂå¤ï¤ê¤Ë)¥»¥¯¥¿¥æ¥Ë¥Ã¥È¤Î³«»Ï¡¢½ªÅÀ¤òÍ¿¤¨¤Þ¤¹\n"
"-b 2048: (¤¢¤ë¼ï¤Î MO ¥É¥é¥¤¥ÖÍѤË) 2048 ¥Ð¥¤¥È¤Î¥»¥¯¥¿¥µ¥¤¥º¤ò»È¤¤¤Þ¤¹\n"
-#: fdisk/fdisk.c:206
+#: fdisk/fdisk.c:207
msgid ""
"Usage: fdisk [-l] [-b SSZ] [-u] device\n"
"E.g.: fdisk /dev/hda (for the first IDE disk)\n"
@@ -1877,222 +2107,222 @@ msgstr ""
" Ëô¤Ï: fdisk /dev/rd/c0d0 Ëô¤Ï: fdisk /dev/ida/c0d0 (RAID ¥Ç¥ô¥¡¥¤¥¹)\n"
" ...\n"
-#: fdisk/fdisk.c:215
+#: fdisk/fdisk.c:216
#, c-format
msgid "Unable to open %s\n"
msgstr "%s ¤ò³«¤±¤Þ¤»¤ó\n"
-#: fdisk/fdisk.c:219
+#: fdisk/fdisk.c:220
#, c-format
msgid "Unable to read %s\n"
msgstr "%s ¤òÆɤá¤Þ¤»¤ó\n"
-#: fdisk/fdisk.c:223
+#: fdisk/fdisk.c:224
#, c-format
msgid "Unable to seek on %s\n"
msgstr "%s ¤ò¥·¡¼¥¯¤Ç¤­¤Þ¤»¤ó\n"
-#: fdisk/fdisk.c:227
+#: fdisk/fdisk.c:228
#, c-format
msgid "Unable to write %s\n"
msgstr "%s ¤Ø¤Î½ñ¤­¹þ¤ß¤¬¤Ç¤­¤Þ¤»¤ó\n"
-#: fdisk/fdisk.c:231
+#: fdisk/fdisk.c:232
#, c-format
msgid "BLKGETSIZE ioctl failed on %s\n"
msgstr "%s ¤Ç¤Î BLKGETSIZE ioctl ¤Ë¼ºÇÔ\n"
-#: fdisk/fdisk.c:235
+#: fdisk/fdisk.c:236
msgid "Unable to allocate any more memory\n"
msgstr "¤³¤ì°Ê¾å¤Î¥á¥â¥ê¤¬³ÎÊݤǤ­¤Þ¤»¤ó\n"
-#: fdisk/fdisk.c:238
+#: fdisk/fdisk.c:239
msgid "Fatal error\n"
msgstr "Ã×̿Ū¤Ê¥¨¥é¡¼\n"
-#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:359 fdisk/fdisk.c:366
-#: fdisk/fdisk.c:389 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:439
-#: fdisk/fdiskbsdlabel.c:124
+#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:360 fdisk/fdisk.c:367
+#: fdisk/fdisk.c:390 fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:440
+#: fdisk/fdiskbsdlabel.c:129
msgid "Command action"
msgstr "¥³¥Þ¥ó¥É¤ÎÆ°ºî"
-#: fdisk/fdisk.c:323
+#: fdisk/fdisk.c:324
msgid " a toggle a read only flag"
msgstr " a Æɹþ¤ßÀìÍѥե饰¤ò¤Ä¤±¤ë"
#. sun
-#: fdisk/fdisk.c:324 fdisk/fdisk.c:368
+#: fdisk/fdisk.c:325 fdisk/fdisk.c:369
msgid " b edit bsd disklabel"
msgstr " b bsd ¥Ç¥£¥¹¥¯¥é¥Ù¥ë¤òÊÔ½¸¤¹¤ë"
-#: fdisk/fdisk.c:325
+#: fdisk/fdisk.c:326
msgid " c toggle the mountable flag"
msgstr " c ¥Þ¥¦¥ó¥È²Äǽ¥Õ¥é¥°¤ò¤Ä¤±¤ë"
#. sun
-#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:370
+#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:371
msgid " d delete a partition"
msgstr " d Îΰè¤òºï½ü¤¹¤ë"
-#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:371
+#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:372
msgid " l list known partition types"
msgstr " l ´ûÃΤÎÎΰ西¥¤¥×¤ò¥ê¥¹¥Èɽ¼¨¤¹¤ë"
#. sun
-#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:360 fdisk/fdisk.c:372
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
-#: fdisk/fdiskbsdlabel.c:129
+#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:361 fdisk/fdisk.c:373
+#: fdisk/fdisk.c:398 fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
+#: fdisk/fdiskbsdlabel.c:134
msgid " m print this menu"
msgstr " m ¤³¤Î¥á¥Ë¥å¡¼¤òɽ¼¨¤¹¤ë"
-#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
+#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374
msgid " n add a new partition"
msgstr " n ¿·¤¿¤ËÎΰè¤òºîÀ®¤¹¤ë"
-#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:361 fdisk/fdisk.c:374
+#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:362 fdisk/fdisk.c:375
msgid " o create a new empty DOS partition table"
msgstr " o ¿·¤¿¤Ë¶õ¤Î DOS Îΰè¥Æ¡¼¥Ö¥ë¤òºîÀ®¤¹¤ë"
-#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:375 fdisk/fdisk.c:398
-#: fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:376 fdisk/fdisk.c:399
+#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
msgid " p print the partition table"
msgstr " p Îΰè¥Æ¡¼¥Ö¥ë¤òɽ¼¨¤¹¤ë"
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:362 fdisk/fdisk.c:376
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
-#: fdisk/fdiskbsdlabel.c:132
+#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:363 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:450
+#: fdisk/fdiskbsdlabel.c:137
msgid " q quit without saving changes"
msgstr " q Êѹ¹¤òÊݸ¤»¤º¤Ë½ªÎ»¤¹¤ë"
-#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:363 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:364 fdisk/fdisk.c:378
msgid " s create a new empty Sun disklabel"
msgstr " s ¶õ¤Î Sun ¥Ç¥£¥¹¥¯¥é¥Ù¥ë¤òºîÀ®¤¹¤ë"
#. sun
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
msgid " t change a partition's system id"
msgstr " t Îΰè¤Î¥·¥¹¥Æ¥à ID ¤òÊѹ¹¤¹¤ë"
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
msgid " u change display/entry units"
msgstr " u ɽ¼¨/¹àÌÜ¥æ¥Ë¥Ã¥È¤òÊѹ¹¤¹¤ë"
-#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380 fdisk/fdisk.c:402
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:452
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381 fdisk/fdisk.c:403
+#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
msgid " v verify the partition table"
msgstr " v Îΰè¥Æ¡¼¥Ö¥ë¤ò¾È¹ç¤¹¤ë"
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381 fdisk/fdisk.c:403
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:382 fdisk/fdisk.c:404
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
msgid " w write table to disk and exit"
msgstr " w ¥Æ¡¼¥Ö¥ë¤ò¥Ç¥£¥¹¥¯¤Ë½ñ¤­¹þ¤ß¡¢½ªÎ»¤¹¤ë"
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:383
msgid " x extra functionality (experts only)"
msgstr " x ÆÃÊ̤ʵ¡Ç½ (¥¨¥­¥¹¥Ñ¡¼¥ÈÀìÍÑ)"
-#: fdisk/fdisk.c:342
+#: fdisk/fdisk.c:343
msgid " a select bootable partition"
msgstr " a ¥Ö¡¼¥È²ÄǽÎΰè¤òÁªÂò¤¹¤ë"
#. sgi flavour
-#: fdisk/fdisk.c:343
+#: fdisk/fdisk.c:344
msgid " b edit bootfile entry"
msgstr " b ¥Ö¡¼¥È¥Õ¥¡¥¤¥ë¥¨¥ó¥È¥ê¤òÊÔ½¸¤¹¤ë"
#. sgi
-#: fdisk/fdisk.c:344
+#: fdisk/fdisk.c:345
msgid " c select sgi swap partition"
msgstr " c sgi ¥¹¥ï¥Ã¥×Îΰè¤òÁªÂò¤¹¤ë"
-#: fdisk/fdisk.c:367
+#: fdisk/fdisk.c:368
msgid " a toggle a bootable flag"
msgstr " a ¥Ö¡¼¥È²Äǽ¥Õ¥é¥°¤ò¤Ä¤±¤ë"
-#: fdisk/fdisk.c:369
+#: fdisk/fdisk.c:370
msgid " c toggle the dos compatibility flag"
msgstr " c dos ¸ß´¹¥Õ¥é¥°¤ò¤Ä¤±¤ë"
-#: fdisk/fdisk.c:390
+#: fdisk/fdisk.c:391
msgid " a change number of alternate cylinders"
msgstr " a ÂåÂØ¥·¥ê¥ó¥À¿ô¤òÊѹ¹¤¹¤ë"
#. sun
-#: fdisk/fdisk.c:391 fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:441
+#: fdisk/fdisk.c:392 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
msgid " c change number of cylinders"
msgstr " c ¥·¥ê¥ó¥À¿ô¤òÊѹ¹¤¹¤ë"
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:393 fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:443
msgid " d print the raw data in the partition table"
msgstr " d Îΰè¥Æ¡¼¥Ö¥ëÆâ¤ÎÀ¸¥Ç¡¼¥¿¤òɽ¼¨¤¹¤ë"
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:394
msgid " e change number of extra sectors per cylinder"
msgstr " e ¥·¥ê¥ó¥ÀËè¤Î;¾ê¥»¥¯¥¿¿ô¤òÊѹ¹¤¹¤ë"
#. sun
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:395 fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
msgid " h change number of heads"
msgstr " h ¥Ø¥Ã¥É¿ô¤òÊѹ¹¤¹¤ë"
-#: fdisk/fdisk.c:395
+#: fdisk/fdisk.c:396
msgid " i change interleave factor"
msgstr " i ¥¤¥ó¥¿¡¼¥ê¡¼¥Ö¥Õ¥¡¥¯¥¿¤òÊѹ¹¤¹¤ë"
#. sun
-#: fdisk/fdisk.c:396
+#: fdisk/fdisk.c:397
msgid " o change rotation speed (rpm)"
msgstr " o ²óž¿ô¤òÊѹ¹¤¹¤ë (rpm)"
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:450
-#: fdisk/fdiskbsdlabel.c:133
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:451
+#: fdisk/fdiskbsdlabel.c:138
msgid " r return to main menu"
msgstr " r ¥á¥¤¥ó¥á¥Ë¥å¡¼¤ËÌá¤ë"
-#: fdisk/fdisk.c:401 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:452
msgid " s change number of sectors/track"
msgstr " s ¥»¥¯¥¿¿ô/¥È¥é¥Ã¥¯¤òÊѹ¹¤¹¤ë"
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:405
msgid " y change number of physical cylinders"
msgstr " y ʪÍý¥·¥ê¥ó¥À¿ô¤òÊѹ¹¤¹¤ë"
-#: fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:440
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:441
msgid " b move beginning of data in a partition"
msgstr " b ÎΰèÆâ¤Î¥Ç¡¼¥¿¤ÎÀèƬ¤Ë°ÜÆ°¤¹¤ë"
-#: fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:443
+#: fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:444
msgid " e list extended partitions"
msgstr " e ³ÈÄ¥Îΰè¤ò¥ê¥¹¥Èɽ¼¨¤¹¤ë"
#. !sun
-#: fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
msgid " g create an IRIX (SGI) partition table"
msgstr " g IRIX (SGI) Îΰè¥Æ¡¼¥Ö¥ë¤òºîÀ®¤¹¤ë"
#. !sun
-#: fdisk/fdisk.c:444
+#: fdisk/fdisk.c:445
msgid " f fix partition order"
msgstr " f Îΰè¤Î½ç½ø¤òŬÀµ²½¤¹¤ë"
-#: fdisk/fdisk.c:561
+#: fdisk/fdisk.c:562
msgid "You must set"
msgstr "ÀßÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹"
-#: fdisk/fdisk.c:575
+#: fdisk/fdisk.c:576
msgid "heads"
msgstr "¥Ø¥Ã¥É¿ô"
-#: fdisk/fdisk.c:577 fdisk/fdisk.c:1142 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:578 fdisk/fdisk.c:1154 fdisk/sfdisk.c:864
msgid "sectors"
msgstr "¥»¥¯¥¿¿ô"
-#: fdisk/fdisk.c:579 fdisk/fdisk.c:1142 fdisk/fdiskbsdlabel.c:464
+#: fdisk/fdisk.c:580 fdisk/fdisk.c:1154 fdisk/fdiskbsdlabel.c:469
#: fdisk/sfdisk.c:864
msgid "cylinders"
msgstr "¥·¥ê¥ó¥À¿ô"
-#: fdisk/fdisk.c:583
+#: fdisk/fdisk.c:584
#, c-format
msgid ""
"%s%s.\n"
@@ -2101,11 +2331,11 @@ msgstr ""
"%s%s.\n"
"¤¢¤Ê¤¿¤ÏÆÃÊ̵¡Ç½¥á¥Ë¥å¡¼¤«¤é¤³¤ì¤ò¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹\n"
-#: fdisk/fdisk.c:584
+#: fdisk/fdisk.c:585
msgid " and "
msgstr " µÚ¤Ó "
-#: fdisk/fdisk.c:601
+#: fdisk/fdisk.c:602
#, c-format
msgid ""
"\n"
@@ -2124,26 +2354,26 @@ msgstr ""
"2) Ê̤ΠOS ¤Î¥Ö¡¼¥È¤ä¥Ñ¡¼¥Æ¥£¥·¥ç¥óºîÀ®¥½¥Õ¥È\n"
" (Îã. DOS FDISK, OS/2 FDISK)\n"
-#: fdisk/fdisk.c:624
+#: fdisk/fdisk.c:625
msgid "Bad offset in primary extended partition\n"
msgstr "´ðËܳÈÄ¥Îΰè¤ËÉÔÀµ¤Ê¥ª¥Õ¥»¥Ã¥È¤¬¤¢¤ê¤Þ¤¹\n"
-#: fdisk/fdisk.c:638
+#: fdisk/fdisk.c:639
#, c-format
msgid "Warning: deleting partitions after %d\n"
msgstr "·Ù¹ð: %d °Ê¹ß¤ÎÎΰè¤òºï½ü¤·¤Þ¤¹\n"
-#: fdisk/fdisk.c:655
+#: fdisk/fdisk.c:656
#, c-format
msgid "Warning: extra link pointer in partition table %d\n"
msgstr "·Ù¹ð: Îΰè¥Æ¡¼¥Ö¥ë %d Æâ¤ÎÆÃÊ̤ʥê¥ó¥¯¥Ý¥¤¥ó¥¿¤Ç¤¹\n"
-#: fdisk/fdisk.c:663
+#: fdisk/fdisk.c:664
#, c-format
msgid "Warning: ignoring extra data in partition table %d\n"
msgstr "·Ù¹ð: Îΰè¥Æ¡¼¥Ö¥ë %d Æâ¤ÎÆÃÊ̤ʥǡ¼¥¿¤ò̵»ë¤·¤Þ¤¹\n"
-#: fdisk/fdisk.c:708
+#: fdisk/fdisk.c:709
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"
@@ -2154,16 +2384,22 @@ msgstr ""
"¤Ï\n"
"¥á¥â¥êÆâ¤À¤±¤Ë»Ä¤·¤Þ¤¹¡£¤½¤Î¸å¤Ï¤â¤Á¤í¤ó°ÊÁ°¤ÎÆâÍƤϽ¤ÉüÉÔ²Äǽ¤Ë¤Ê¤ê¤Þ¤¹¡£\n"
-#: fdisk/fdisk.c:752
+#: fdisk/fdisk.c:753
#, c-format
msgid "Note: sector size is %d (not %d)\n"
msgstr "Ãí°Õ: ¥»¥¯¥¿¥µ¥¤¥º¤¬ %d ¤Ç¤¹ (%d ¤Ç¤Ï¤Ê¤¯)\n"
-#: fdisk/fdisk.c:870
+#: fdisk/fdisk.c:883
msgid "You will not be able to write the partition table.\n"
msgstr "Îΰè¥Æ¡¼¥Ö¥ë¤Î½ñ¤­¹þ¤ß¤ò¹Ô¤¨¤Þ¤»¤ó¡£\n"
-#: fdisk/fdisk.c:903
+#: fdisk/fdisk.c:914
+msgid ""
+"This disk has both DOS and BSD magic.\n"
+"Give the 'b' command to go to BSD mode.\n"
+msgstr ""
+
+#: fdisk/fdisk.c:924
msgid ""
"Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
"disklabel\n"
@@ -2171,16 +2407,16 @@ msgstr ""
"¥Ç¥Ð¥¤¥¹¤ÏÀµ¾ï¤Ê DOS Îΰè¥Æ¡¼¥Ö¥ë¤â¡¢Sun, SGI ¤ä OSF ¥Ç¥£¥¹¥¯¥é¥Ù¥ë¤â\n"
"´Þ¤ó¤Ç¤¤¤Þ¤»¤ó\n"
-#: fdisk/fdisk.c:920
+#: fdisk/fdisk.c:942
msgid "Internal error\n"
msgstr "ÆâÉô¥¨¥é¡¼\n"
-#: fdisk/fdisk.c:942
+#: fdisk/fdisk.c:954
#, c-format
msgid "Ignoring extra extended partition %d\n"
msgstr "ÆÃÊ̤ʳÈÄ¥Îΰè %d ¤ò̵»ë¤·¤Þ¤¹\n"
-#: fdisk/fdisk.c:954
+#: fdisk/fdisk.c:966
#, c-format
msgid ""
"Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2189,7 +2425,7 @@ msgstr ""
"·Ù¹ð: Îΰè¥Æ¡¼¥Ö¥ë %2$d ¤ÎÉÔÀµ¤Ê¥Õ¥é¥° 0x%1$04x ¤Ï w(½ñ¤­¹þ¤ß)¤Ë¤è¤Ã¤Æ\n"
"Àµ¾ï¤Ë¤Ê¤ê¤Þ¤¹\n"
-#: fdisk/fdisk.c:976
+#: fdisk/fdisk.c:988
msgid ""
"\n"
"got EOF thrice - exiting..\n"
@@ -2197,65 +2433,65 @@ msgstr ""
"\n"
"EOF ¤ò 3 ²óÆɤߤޤ·¤¿ -- ½ªÎ»¤·¤Þ¤¹..\n"
-#: fdisk/fdisk.c:1015
+#: fdisk/fdisk.c:1027
msgid "Hex code (type L to list codes): "
msgstr "16¿Ê¿ô¥³¡¼¥É (L ¥³¥Þ¥ó¥É¤Ç¥³¡¼¥É¥ê¥¹¥Èɽ¼¨): "
-#: fdisk/fdisk.c:1054
+#: fdisk/fdisk.c:1066
#, c-format
msgid "%s (%d-%d, default %d): "
msgstr "%s (%d-%d, ½é´üÃÍ %d): "
-#: fdisk/fdisk.c:1110
+#: fdisk/fdisk.c:1122
#, c-format
msgid "Using default value %d\n"
msgstr "½é´üÃÍ %d ¤ò»È¤¤¤Þ¤¹\n"
-#: fdisk/fdisk.c:1114
+#: fdisk/fdisk.c:1126
msgid "Value out of range.\n"
msgstr "Èϰϳ°¤ÎÃͤǤ¹¡£\n"
-#: fdisk/fdisk.c:1124
+#: fdisk/fdisk.c:1136
msgid "Partition number"
msgstr "ÎΰèÈÖ¹æ"
-#: fdisk/fdisk.c:1133
+#: fdisk/fdisk.c:1145
#, c-format
msgid "Warning: partition %d has empty type\n"
msgstr "·Ù¹ð: Îΰè %d ¤Ï¶õ¤Î¥¿¥¤¥×¤Ç¤¹¡£\n"
-#: fdisk/fdisk.c:1140
+#: fdisk/fdisk.c:1152
msgid "cylinder"
msgstr "¥·¥ê¥ó¥À"
-#: fdisk/fdisk.c:1140
+#: fdisk/fdisk.c:1152
msgid "sector"
msgstr "¥»¥¯¥¿"
-#: fdisk/fdisk.c:1149
+#: fdisk/fdisk.c:1161
#, c-format
msgid "Changing display/entry units to %s\n"
msgstr "%s ¤Îɽ¼¨/¹àÌÜ¥æ¥Ë¥Ã¥È¤òÊѹ¹¤·¤Þ¤¹\n"
-#: fdisk/fdisk.c:1160
+#: fdisk/fdisk.c:1172
#, c-format
msgid "WARNING: Partition %d is an extended partition\n"
msgstr "·Ù¹ð: Îΰè %d ¤Ï³ÈÄ¥Îΰè¤Ç¤¹\n"
-#: fdisk/fdisk.c:1171
+#: fdisk/fdisk.c:1183
msgid "DOS Compatibility flag is set\n"
msgstr "DOS ¸ß´¹¥Õ¥é¥°¤¬ÀßÄꤵ¤ì¤Þ¤·¤¿\n"
-#: fdisk/fdisk.c:1175
+#: fdisk/fdisk.c:1187
msgid "DOS Compatibility flag is not set\n"
msgstr "DOS ¸ß´¹¥Õ¥é¥°¤ÏÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
-#: fdisk/fdisk.c:1261
+#: fdisk/fdisk.c:1273
#, c-format
msgid "Partition %d does not exist yet!\n"
msgstr "Îΰè %d ¤Ï¤Þ¤À¸ºß¤·¤Þ¤»¤ó¡ª\n"
-#: fdisk/fdisk.c:1266
+#: fdisk/fdisk.c:1278
msgid ""
"Type 0 means free space to many systems\n"
"(but not to Linux). Having partitions of\n"
@@ -2267,7 +2503,7 @@ msgstr ""
"¿ʬÀõ¤Ï¤«¤Ê¤³¤È¤Ç¤¹¡£¤¢¤Ê¤¿¤Ï `d' ¥³¥Þ¥ó¥É¤ò»È¤Ã¤Æ¤³¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ò\n"
"ºï½ü¤Ç¤­¤Þ¤¹¡£\n"
-#: fdisk/fdisk.c:1275
+#: fdisk/fdisk.c:1287
msgid ""
"You cannot change a partition into an extended one or vice versa\n"
"Delete it first.\n"
@@ -2275,7 +2511,7 @@ msgstr ""
"¤¢¤Ê¤¿¤ÏÎΰè¤ò³ÈÄ¥Îΰè¤ËÊѹ¹¤Ç¤­¤Þ¤»¤ó¤·¡¢¤½¤ÎµÕ¤â¤Þ¤¿\n"
"¤Ç¤­¤Þ¤»¤ó¡£¤Þ¤ººï½ü¤ò¹Ô¤Ê¤Ã¤Æ¤¯¤À¤µ¤¤¡£\n"
-#: fdisk/fdisk.c:1284
+#: fdisk/fdisk.c:1296
msgid ""
"Consider leaving partition 3 as Whole disk (5),\n"
"as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2284,7 +2520,7 @@ msgstr ""
"Îΰè 3 ¤ò Whole disk (5) ¤È¤·¤Æ»Ä¤·¤Æ¤ª¤¯¤³¤È¤ò¹Íθ¤·¤Æ¤¯¤À¤µ¤¤¡¢\n"
"SunOS/Solaris ¤Ï¤³¤ì¤ò´üÂÔ¤·¤Þ¤¹¤·¡¢Linux ¤Ç¤µ¤¨¤½¤ì¤¬Ë¾¤Þ¤·¤¤¤Ç¤¹¡£\n"
-#: fdisk/fdisk.c:1290
+#: fdisk/fdisk.c:1302
msgid ""
"Consider leaving partition 9 as volume header (0),\n"
"and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2293,52 +2529,52 @@ msgstr ""
"Îΰè 9 ¤ò volume header (0) ¤È¤·¤Æ¡¢µÚ¤ÓÎΰè 11 ¤ò entire volume (6)\n"
"¤È¤·¤Æ»Ä¤·¤Æ¤ª¤¯¤³¤È¤ò¹Íθ¤·¤Æ¤¯¤À¤µ¤¤¡£IRIX ¤Ï¤³¤ì¤òÁÛÄꤷ¤Þ¤¹¡£\n"
-#: fdisk/fdisk.c:1303
+#: fdisk/fdisk.c:1315
#, c-format
msgid "Changed system type of partition %d to %x (%s)\n"
msgstr "Îΰè¤Î¥·¥¹¥Æ¥à¥¿¥¤¥×¤ò %d ¤«¤é %x (%s) ¤ËÊѹ¹¤·¤Þ¤·¤¿\n"
-#: fdisk/fdisk.c:1357
+#: fdisk/fdisk.c:1369
#, c-format
msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
msgstr "Îΰè %d ¤Ï°Û¤Ê¤Ã¤¿ÊªÍý/ÏÀÍý³«»Ï°ÌÃ֤ˤʤäƤ¤¤Þ¤¹(Linux ¤Ç¤Ï̵¤¤?):\n"
-#: fdisk/fdisk.c:1359 fdisk/fdisk.c:1367 fdisk/fdisk.c:1376 fdisk/fdisk.c:1385
+#: fdisk/fdisk.c:1371 fdisk/fdisk.c:1379 fdisk/fdisk.c:1388 fdisk/fdisk.c:1397
#, c-format
msgid " phys=(%d, %d, %d) "
msgstr " ʪÍý=(%d, %d, %d) "
-#: fdisk/fdisk.c:1360 fdisk/fdisk.c:1368
+#: fdisk/fdisk.c:1372 fdisk/fdisk.c:1380
#, c-format
msgid "logical=(%d, %d, %d)\n"
msgstr "ÏÀÍý=(%d, %d, %d)\n"
-#: fdisk/fdisk.c:1365
+#: fdisk/fdisk.c:1377
#, c-format
msgid "Partition %d has different physical/logical endings:\n"
msgstr "Îΰè %d ¤Ï°Û¤Ê¤Ã¤¿ÊªÍý/ÏÀÍý½ªÅÀ¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹:\n"
-#: fdisk/fdisk.c:1374
+#: fdisk/fdisk.c:1386
#, c-format
msgid "Partition %i does not start on cylinder boundary:\n"
msgstr "Îΰè %i ¤Ï¥·¥ê¥ó¥À¶­³¦¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤Þ¤»¤ó:\n"
-#: fdisk/fdisk.c:1377
+#: fdisk/fdisk.c:1389
#, c-format
msgid "should be (%d, %d, 1)\n"
msgstr "(%d, %d, 1) ¤Ç¤¢¤ë¤Ù¤­¤Ç¤¹\n"
-#: fdisk/fdisk.c:1383
+#: fdisk/fdisk.c:1395
#, c-format
msgid "Partition %i does not end on cylinder boundary:\n"
msgstr "Îΰè %i ¤Ï¥·¥ê¥ó¥À¶­³¦¤Ç½ª¤ï¤Ã¤Æ¤¤¤Þ¤»¤ó:\n"
-#: fdisk/fdisk.c:1386
+#: fdisk/fdisk.c:1398
#, c-format
msgid "should be (%d, %d, %d)\n"
msgstr "(%d, %d, %d) ¤Ç¤¢¤ë¤Ù¤­¤Ç¤¹\n"
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1405
#, c-format
msgid ""
"\n"
@@ -2351,7 +2587,7 @@ msgstr ""
"¥æ¥Ë¥Ã¥È = %s of %d * %d ¥Ð¥¤¥È\n"
"\n"
-#: fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1513
msgid ""
"Nothing to do. Ordering is correct already.\n"
"\n"
@@ -2359,16 +2595,16 @@ msgstr ""
"¹Ô¤¦¤Ù¤­¤³¤È¤Ï¤¢¤ê¤Þ¤»¤ó¡£´û¤ËÀµ¾ï¤Ê½ç½ø¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£\n"
"\n"
-#: fdisk/fdisk.c:1565
+#: fdisk/fdisk.c:1577
#, c-format
msgid "%*s Boot Start End Blocks Id System\n"
msgstr "%*s ¥Ö¡¼¥È »ÏÅÀ ½ªÅÀ ¥Ö¥í¥Ã¥¯ ID ¥·¥¹¥Æ¥à\n"
-#: fdisk/fdisk.c:1566 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:675
+#: fdisk/fdisk.c:1578 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:675
msgid "Device"
msgstr "¥Ç¥Ð¥¤¥¹"
-#: fdisk/fdisk.c:1603
+#: fdisk/fdisk.c:1615
msgid ""
"\n"
"Partition table entries are not in disk order\n"
@@ -2376,7 +2612,7 @@ msgstr ""
"\n"
"Îΰè¥Æ¡¼¥Ö¥ë¹àÌܤ¬¥Ç¥£¥¹¥¯¤Î½ç½ø¤È°ìÃפ·¤Þ¤»¤ó\n"
-#: fdisk/fdisk.c:1613
+#: fdisk/fdisk.c:1625
#, c-format
msgid ""
"\n"
@@ -2387,91 +2623,91 @@ msgstr ""
"¥Ç¥£¥¹¥¯ %s: ¥Ø¥Ã¥É %d, ¥»¥¯¥¿ %d, ¥·¥ê¥ó¥À %d\n"
"\n"
-#: fdisk/fdisk.c:1615
+#: fdisk/fdisk.c:1627
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:1659
+#: fdisk/fdisk.c:1671
#, c-format
msgid "Warning: partition %d contains sector 0\n"
msgstr "·Ù¹ð: Îΰè %d ¤Ï¥»¥¯¥¿ 0 ¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹\n"
-#: fdisk/fdisk.c:1662
+#: fdisk/fdisk.c:1674
#, c-format
msgid "Partition %d: head %d greater than maximum %d\n"
msgstr "Îΰè %d: ¥Ø¥Ã¥É %d ¤ÏºÇÂçÃÍ %d ¤è¤ê¤âÂ礭¤¤¤Ç¤¹\n"
-#: fdisk/fdisk.c:1665
+#: fdisk/fdisk.c:1677
#, c-format
msgid "Partition %d: sector %d greater than maximum %d\n"
msgstr "Îΰè %d: ¥»¥¯¥¿ %d ¤ÏºÇÂçÃÍ %d ¤è¤ê¤âÂ礭¤¤¤Ç¤¹\n"
-#: fdisk/fdisk.c:1668
+#: fdisk/fdisk.c:1680
#, c-format
msgid "Partitions %d: cylinder %d greater than maximum %d\n"
msgstr "Îΰè %d: ¥·¥ê¥ó¥À %d ¤ÏºÇÂçÃÍ %d ¤è¤ê¤âÂ礭¤¤¤Ç¤¹\n"
-#: fdisk/fdisk.c:1672
+#: fdisk/fdisk.c:1684
#, c-format
msgid "Partition %d: previous sectors %d disagrees with total %d\n"
msgstr "Îΰè %d: Á°¤Î¥»¥¯¥¿ %d ¤Ï¹ç·× %d ¤È°ìÃפ·¤Þ¤»¤ó\n"
-#: fdisk/fdisk.c:1704
+#: fdisk/fdisk.c:1716
#, c-format
msgid "Warning: bad start-of-data in partition %d\n"
msgstr "·Ù¹ð: Îΰè %d ¤ËÉÔÀµ¤Ê¥Ç¡¼¥¿³«»Ï°ÌÃÖ¤¬¤¢¤ê¤Þ¤¹\n"
-#: fdisk/fdisk.c:1712
+#: fdisk/fdisk.c:1724
#, c-format
msgid "Warning: partition %d overlaps partition %d.\n"
msgstr "·Ù¹ð: Îΰè %d ¤Ï¡¢Îΰè %d ¤È½Å¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£\n"
-#: fdisk/fdisk.c:1732
+#: fdisk/fdisk.c:1744
#, c-format
msgid "Warning: partition %d is empty\n"
msgstr "·Ù¹ð: Îΰè %d ¤Ï¶õ¤Ç¤¹\n"
-#: fdisk/fdisk.c:1737
+#: fdisk/fdisk.c:1749
#, c-format
msgid "Logical partition %d not entirely in partition %d\n"
msgstr "ÏÀÍýÎΰè %d ¤ÏÎΰè %d Á´ÂΤˤʤäƤ¤¤Þ¤»¤ó\n"
-#: fdisk/fdisk.c:1743
+#: fdisk/fdisk.c:1755
#, c-format
msgid "Total allocated sectors %d greater than the maximum %d\n"
msgstr "¹ç·×³ÎÊÝ¥»¥¯¥¿ %d ¤ÏºÇÂçÃÍ %d ¤è¤ê¤âÂ礭¤¤¤Ç¤¹\n"
-#: fdisk/fdisk.c:1746
+#: fdisk/fdisk.c:1758
#, c-format
msgid "%d unallocated sectors\n"
msgstr "³ÎÊݤµ¤ì¤Æ¤¤¤Ê¤¤¥»¥¯¥¿¤¬ %d ¤¢¤ê¤Þ¤¹\n"
-#: fdisk/fdisk.c:1759 fdisk/fdisksgilabel.c:661 fdisk/fdisksunlabel.c:505
+#: fdisk/fdisk.c:1771 fdisk/fdisksgilabel.c:661 fdisk/fdisksunlabel.c:505
#, c-format
msgid "Partition %d is already defined. Delete it before re-adding it.\n"
msgstr "Îΰè %d ¤ÏÄêµÁºÑ¤Ç¤¹¡£¤Þ¤º¤Ïºï½ü¤ò¹Ô¤Ê¤Ã¤Æ¤¯¤À¤µ¤¤¡£\n"
-#: fdisk/fdisk.c:1780 fdisk/fdiskbsdlabel.c:279 fdisk/fdisksgilabel.c:683
+#: fdisk/fdisk.c:1792 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:683
#: fdisk/fdisksunlabel.c:520
#, c-format
msgid "First %s"
msgstr "ºÇ½é %s"
-#: fdisk/fdisk.c:1795 fdisk/fdisksunlabel.c:561
+#: fdisk/fdisk.c:1807 fdisk/fdisksunlabel.c:561
#, c-format
msgid "Sector %d is already allocated\n"
msgstr "¥»¥¯¥¿ %d ¤Ï´û¤Ë³ÎÊݺѤߤǤ¹\n"
-#: fdisk/fdisk.c:1831
+#: fdisk/fdisk.c:1843
msgid "No free sectors available\n"
msgstr "ÍøÍѲÄǽ¥Õ¥ê¡¼¥»¥¯¥¿¤¬¤¢¤ê¤Þ¤»¤ó\n"
-#: fdisk/fdisk.c:1840 fdisk/fdiskbsdlabel.c:286 fdisk/fdisksunlabel.c:572
+#: fdisk/fdisk.c:1852 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:572
#, c-format
msgid "Last %s or +size or +sizeM or +sizeK"
msgstr "½ªÅÀ %s ¤Þ¤¿¤Ï +¥µ¥¤¥º ¤Þ¤¿¤Ï +¥µ¥¤¥ºM ¤Þ¤¿¤Ï +¥µ¥¤¥ºK"
-#: fdisk/fdisk.c:1905
+#: fdisk/fdisk.c:1917
msgid ""
"\tSorry - this fdisk cannot handle AIX disk labels.\n"
"\tIf you want to add DOS-type partitions, create\n"
@@ -2483,15 +2719,15 @@ msgstr ""
"\t¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¥Æ¡¼¥Ö¥ë¤òºîÀ®¤·¤Æ¤¯¤À¤µ¤¤¡£(o ¤ò»È¤¦)\n"
"\t·Ù¹ð: ¤³¤ì¤Ï¸½ºß¤Î¥Ç¥£¥¹¥¯ÆâÍƤòÇ˲õ¤·¤Þ¤¹¡£\n"
-#: fdisk/fdisk.c:1914 fdisk/fdiskbsdlabel.c:613
+#: fdisk/fdisk.c:1926 fdisk/fdiskbsdlabel.c:617
msgid "The maximum number of partitions has been created\n"
msgstr "ºÇÂçÎΰè¿ô¤ÏºîÀ®ºÑ¤Ç¤¹\n"
-#: fdisk/fdisk.c:1924
+#: fdisk/fdisk.c:1936
msgid "You must delete some partition and add an extended partition first\n"
msgstr "³ÈÄ¥Îΰè¤òÄɲ乤ëÁ°¤Ë¡¢¤Þ¤ºÎΰè¤òºï½ü¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹\n"
-#: fdisk/fdisk.c:1929
+#: fdisk/fdisk.c:1941
#, c-format
msgid ""
"Command action\n"
@@ -2502,20 +2738,20 @@ msgstr ""
" %s\n"
" p ´ðËÜÎΰè (1-4)\n"
-#: fdisk/fdisk.c:1931
+#: fdisk/fdisk.c:1943
msgid "l logical (5 or over)"
msgstr "l ÏÀÍý (5 °Ê¾å)"
-#: fdisk/fdisk.c:1931
+#: fdisk/fdisk.c:1943
msgid "e extended"
msgstr "e ³ÈÄ¥"
-#: fdisk/fdisk.c:1948
+#: fdisk/fdisk.c:1960
#, c-format
msgid "Invalid partition number for type `%c'\n"
msgstr "¥¿¥¤¥× `%c' ¤Ë¤È¤Ã¤Æ¤ÏÉÔÀµ¤ÊÎΰèÈÖ¹æ¤Ç¤¹\n"
-#: fdisk/fdisk.c:1984
+#: fdisk/fdisk.c:1996
msgid ""
"The partition table has been altered!\n"
"\n"
@@ -2523,11 +2759,11 @@ msgstr ""
"Îΰè¥Æ¡¼¥Ö¥ë¤Ï¸ò´¹¤µ¤ì¤Þ¤·¤¿¡ª\n"
"\n"
-#: fdisk/fdisk.c:1993
+#: fdisk/fdisk.c:2005
msgid "Calling ioctl() to re-read partition table.\n"
msgstr "ioctl() ¤ò¸Æ¤Ó½Ð¤·¤ÆÎΰè¥Æ¡¼¥Ö¥ë¤òºÆÆɹþ¤ß¤·¤Þ¤¹¡£\n"
-#: fdisk/fdisk.c:2009
+#: fdisk/fdisk.c:2021
#, c-format
msgid ""
"\n"
@@ -2540,7 +2776,7 @@ msgstr ""
"¥«¡¼¥Í¥ë¤Ï¤Þ¤À¸Å¤¤¥Æ¡¼¥Ö¥ë¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£\n"
"¿·¤·¤¤¥Æ¡¼¥Ö¥ë¤Ï¼¡²ó¥ê¥Ö¡¼¥È»þ¤Ë»È¤¨¤ë¤è¤¦¤Ë¤Ê¤ë¤Ç¤·¤ç¤¦¡£\n"
-#: fdisk/fdisk.c:2019
+#: fdisk/fdisk.c:2031
msgid ""
"\n"
"WARNING: If you have created or modified any DOS 6.x\n"
@@ -2551,65 +2787,65 @@ msgstr ""
"·Ù¹ð: DOS 6.x Îΰè¤òºîÀ®¡¢¤Þ¤¿¤ÏÊѹ¹¤·¤Æ¤·¤Þ¤Ã¤¿¾ì¹ç¤Ï¡¢\n"
"fdisk ¥Þ¥Ë¥å¥¢¥ë¤ÎÄɲþðÊó¥Ú¡¼¥¸¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
-#: fdisk/fdisk.c:2026
+#: fdisk/fdisk.c:2038
msgid "Syncing disks.\n"
msgstr "¥Ç¥£¥¹¥¯¤òƱ´ü¤µ¤»¤Þ¤¹¡£\n"
-#: fdisk/fdisk.c:2073
+#: fdisk/fdisk.c:2085
#, c-format
msgid "Partition %d has no data area\n"
msgstr "Îΰè %d ¤Ë¥Ç¡¼¥¿Îΰ褬¤¢¤ê¤Þ¤»¤ó\n"
-#: fdisk/fdisk.c:2078
+#: fdisk/fdisk.c:2090
msgid "New beginning of data"
msgstr "¿·µ¬¥Ç¡¼¥¿³«»Ï°ÌÃÖ"
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2106
msgid "Expert command (m for help): "
msgstr "¾åµé¼Ô¥³¥Þ¥ó¥É (m ¤Ç¥Ø¥ë¥×): "
-#: fdisk/fdisk.c:2107
+#: fdisk/fdisk.c:2119
msgid "Number of cylinders"
msgstr "¥·¥ê¥ó¥À¿ô"
-#: fdisk/fdisk.c:2134
+#: fdisk/fdisk.c:2146
msgid "Number of heads"
msgstr "¥Ø¥Ã¥É¿ô"
-#: fdisk/fdisk.c:2159
+#: fdisk/fdisk.c:2171
msgid "Number of sectors"
msgstr "¥»¥¯¥¿¿ô"
-#: fdisk/fdisk.c:2162
+#: fdisk/fdisk.c:2174
msgid "Warning: setting sector offset for DOS compatiblity\n"
msgstr "·Ù¹ð: DOS ¸ß´¹¤Î¤¿¤á¤Î¥»¥¯¥¿¥ª¥Õ¥»¥Ã¥È¤òÀßÄꤷ¤Þ¤¹\n"
-#: fdisk/fdisk.c:2237
+#: fdisk/fdisk.c:2249
#, c-format
msgid "Disk %s doesn't contain a valid partition table\n"
msgstr "¥Ç¥£¥¹¥¯ %s ¤ÏÀµ¾ï¤ÊÎΰè¥Æ¡¼¥Ö¥ë¤ò´Þ¤ó¤Ç¤¤¤Þ¤»¤ó\n"
-#: fdisk/fdisk.c:2251
+#: fdisk/fdisk.c:2263
#, c-format
msgid "Cannot open %s\n"
msgstr "%s ¤ò³«¤±¤Þ¤»¤ó\n"
-#: fdisk/fdisk.c:2267 fdisk/sfdisk.c:2363
+#: fdisk/fdisk.c:2279 fdisk/sfdisk.c:2363
#, c-format
msgid "cannot open %s\n"
msgstr "%s ¤ò³«¤±¤Þ¤»¤ó\n"
-#: fdisk/fdisk.c:2289
+#: fdisk/fdisk.c:2301
#, c-format
msgid "%c: unknown command\n"
msgstr "%c: ÉÔÌÀ¤Ê¥³¥Þ¥ó¥É\n"
-#: fdisk/fdisk.c:2339
+#: fdisk/fdisk.c:2351
msgid "This kernel finds the sector size itself - -b option ignored\n"
msgstr ""
"¤³¤Î¥«¡¼¥Í¥ë¤Ï¥»¥¯¥¿¥µ¥¤¥º¤ò¼«Ê¬Ç§¼±¤·¤Þ¤¹ -- -b ¥ª¥×¥·¥ç¥ó¤Ï̵»ë¤·¤Þ¤¹\n"
-#: fdisk/fdisk.c:2342
+#: fdisk/fdisk.c:2355
msgid ""
"Warning: the -b (set sector size) option should be used with one specified "
"device\n"
@@ -2617,20 +2853,19 @@ msgstr ""
"·Ù¹ð: -b (¥»¥¯¥¿¥µ¥¤¥ºÀßÄê) ¥ª¥×¥·¥ç¥ó¤Ï 1 ¤Ä¤Î¥Ç¥Ð¥¤¥¹»ØÄê¤È¶¦¤Ë\n"
"»ÈÍѤµ¤ì¤ë¤Ù¤­¤Ç¤¹\n"
-#: fdisk/fdisk.c:2405
-#, c-format
-msgid ""
-"Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
-"To return to DOS partition table mode, use the 'r' command.\n"
+#. OSF label, and no DOS label
+#: fdisk/fdisk.c:2414
+#, fuzzy, c-format
+msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
msgstr ""
"%s ¤ÇOSF/1 ¥Ç¥£¥¹¥¯¥é¥Ù¥ë¤ò¸¡½Ð¤·¤¿¤Î¤Ç¡¢¥Ç¥£¥¹¥¯¥é¥Ù¥ë¥â¡¼¥É¤Ë°Ü¹Ô¤·¤Þ¤¹¡£\n"
"DOS Îΰè¥Æ¡¼¥Ö¥ë¥â¡¼¥É¤ËÌá¤ë¤Ë¤Ï¡¢'r' ¥³¥Þ¥ó¥É¤ò»È¤¤¤Þ¤·¤ç¤¦¡£\n"
-#: fdisk/fdisk.c:2413
+#: fdisk/fdisk.c:2424
msgid "Command (m for help): "
msgstr "¥³¥Þ¥ó¥É (m ¤Ç¥Ø¥ë¥×): "
-#: fdisk/fdisk.c:2429
+#: fdisk/fdisk.c:2440
#, c-format
msgid ""
"\n"
@@ -2639,15 +2874,15 @@ msgstr ""
"\n"
"¸½ºß¤Î¥Ö¡¼¥È¥Õ¥¡¥¤¥ë¤Ï: %s\n"
-#: fdisk/fdisk.c:2431
+#: fdisk/fdisk.c:2442
msgid "Please enter the name of the new boot file: "
msgstr "¿·¤¿¤Ê¥Ö¡¼¥È¥Õ¥¡¥¤¥ë̾¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: "
-#: fdisk/fdisk.c:2433
+#: fdisk/fdisk.c:2444
msgid "Boot file unchanged\n"
msgstr "¥Ö¡¼¥È¥Õ¥¡¥¤¥ë¤òÊѹ¹¤·¤Þ¤»¤ó¤Ç¤·¤¿\n"
-#: fdisk/fdisk.c:2497
+#: fdisk/fdisk.c:2508
msgid ""
"\n"
"\tSorry, no experts menu for SGI partition tables available.\n"
@@ -2685,7 +2920,7 @@ msgstr ""
" ɬ¤º¥Ç¥£¥¹¥¯¾å¤ÎÏÀÍý¥Ç¥£¥¹¥¯¤òºï½ü¤·¤Æ¤¯¤À¤µ¤¤¡£(¾¤ÎÊýË¡\n"
" ¤È¤·¤Æ¤Ï¡¢¤¢¤Ê¤¿¤¬Ã£¿Í(AIXpert)¤Ë¤Ê¤ë¤³¤È¤Ç¤¹)"
-#: fdisk/fdiskbsdlabel.c:117
+#: fdisk/fdiskbsdlabel.c:122
#, c-format
msgid ""
"\n"
@@ -2694,167 +2929,167 @@ msgstr ""
"\n"
"BSD ¥é¥Ù¥ëÍѥǥХ¤¥¹: %s\n"
-#: fdisk/fdiskbsdlabel.c:125
+#: fdisk/fdiskbsdlabel.c:130
msgid " d delete a BSD partition"
msgstr " d BSD Îΰè¤òºï½ü¤¹¤ë"
-#: fdisk/fdiskbsdlabel.c:126
+#: fdisk/fdiskbsdlabel.c:131
msgid " e edit drive data"
msgstr " e ¥É¥é¥¤¥Ö¥Ç¡¼¥¿¤òÊÔ½¸¤¹¤ë"
-#: fdisk/fdiskbsdlabel.c:127
+#: fdisk/fdiskbsdlabel.c:132
msgid " i install bootstrap"
msgstr " i ¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë"
-#: fdisk/fdiskbsdlabel.c:128
+#: fdisk/fdiskbsdlabel.c:133
msgid " l list known filesystem types"
msgstr " l ´ûÃΤΥե¡¥¤¥ë¥·¥¹¥Æ¥à¥¿¥¤¥×¤ò¥ê¥¹¥Èɽ¼¨¤¹¤ë"
-#: fdisk/fdiskbsdlabel.c:130
+#: fdisk/fdiskbsdlabel.c:135
msgid " n add a new BSD partition"
msgstr " n ¿·¤¿¤Ë BSD Îΰè¤òºîÀ®¤¹¤ë"
-#: fdisk/fdiskbsdlabel.c:131
+#: fdisk/fdiskbsdlabel.c:136
msgid " p print BSD partition table"
msgstr " p BSD Îΰè¥Æ¡¼¥Ö¥ë¤òɽ¼¨¤¹¤ë"
-#: fdisk/fdiskbsdlabel.c:134
+#: fdisk/fdiskbsdlabel.c:139
msgid " s show complete disklabel"
msgstr " s ´°Á´¤Ê¥Ç¥£¥¹¥¯¥é¥Ù¥ë¤òɽ¼¨¤¹¤ë"
-#: fdisk/fdiskbsdlabel.c:135
+#: fdisk/fdiskbsdlabel.c:140
msgid " t change a partition's filesystem id"
msgstr " t Îΰè¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à ID ¤òÊѹ¹¤¹¤ë"
-#: fdisk/fdiskbsdlabel.c:136
+#: fdisk/fdiskbsdlabel.c:141
msgid " u change units (cylinders/sectors)"
msgstr " u ¥æ¥Ë¥Ã¥È¤ÎÊѹ¹(¥·¥ê¥ó¥À/¥»¥¯¥¿)"
-#: fdisk/fdiskbsdlabel.c:137
+#: fdisk/fdiskbsdlabel.c:142
msgid " w write disklabel to disk"
msgstr " w ¥Ç¥£¥¹¥¯¥é¥Ù¥ë¤ò¥Ç¥£¥¹¥¯¤Ë½ñ¤­¹þ¤à"
-#: fdisk/fdiskbsdlabel.c:139
+#: fdisk/fdiskbsdlabel.c:144
msgid " x link BSD partition to non-BSD partition"
msgstr " x BSD Îΰè¤òÈó BSD Îΰè¤È¥ê¥ó¥¯¤¹¤ë"
-#: fdisk/fdiskbsdlabel.c:171
+#: fdisk/fdiskbsdlabel.c:176
#, c-format
msgid "Partition %s has invalid starting sector 0.\n"
msgstr "Îΰè %s ¤ÏÉÔÀµ¤Ê»ÏÅÀ¥»¥¯¥¿ 0 ¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤Þ¤¹¡£\n"
-#: fdisk/fdiskbsdlabel.c:175
+#: fdisk/fdiskbsdlabel.c:180
#, c-format
msgid "Reading disklabel of %s at sector %d.\n"
msgstr "%s ¤Î¥Ç¥£¥¹¥¯¥é¥Ù¥ë¤Î¥»¥¯¥¿ %d ¤òÆɹþ¤ß¤Þ¤¹¡£\n"
-#: fdisk/fdiskbsdlabel.c:185
+#: fdisk/fdiskbsdlabel.c:190
#, c-format
msgid "There is no *BSD partition on %s.\n"
msgstr "%s ¤Ë¤Ï *BSD Îΰè¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
-#: fdisk/fdiskbsdlabel.c:199
+#: fdisk/fdiskbsdlabel.c:204
msgid "BSD disklabel command (m for help): "
msgstr "BSD ¥Ç¥£¥¹¥¯¥é¥Ù¥ë¥³¥Þ¥ó¥É (m ¤Ç¥Ø¥ë¥×): "
-#: fdisk/fdiskbsdlabel.c:313
+#: fdisk/fdiskbsdlabel.c:318
#, c-format
msgid "type: %s\n"
msgstr "¥¿¥¤¥×: %s\n"
-#: fdisk/fdiskbsdlabel.c:315
+#: fdisk/fdiskbsdlabel.c:320
#, c-format
msgid "type: %d\n"
msgstr "¥¿¥¤¥×: %d\n"
-#: fdisk/fdiskbsdlabel.c:316
+#: fdisk/fdiskbsdlabel.c:321
#, c-format
msgid "disk: %.*s\n"
msgstr "¥Ç¥£¥¹¥¯: %.*s\n"
-#: fdisk/fdiskbsdlabel.c:317
+#: fdisk/fdiskbsdlabel.c:322
#, c-format
msgid "label: %.*s\n"
msgstr "¥é¥Ù¥ë: %.*s\n"
-#: fdisk/fdiskbsdlabel.c:318
+#: fdisk/fdiskbsdlabel.c:323
msgid "flags:"
msgstr "¥Õ¥é¥°:"
-#: fdisk/fdiskbsdlabel.c:320
+#: fdisk/fdiskbsdlabel.c:325
msgid " removable"
msgstr " ¼è½Ð¤·²Äǽ"
-#: fdisk/fdiskbsdlabel.c:322
+#: fdisk/fdiskbsdlabel.c:327
msgid " ecc"
msgstr " ecc"
-#: fdisk/fdiskbsdlabel.c:324
+#: fdisk/fdiskbsdlabel.c:329
msgid " badsect"
msgstr " badsect"
#. On various machines the fields of *lp are short/int/long
#. In order to avoid problems, we cast them all to long.
-#: fdisk/fdiskbsdlabel.c:328
+#: fdisk/fdiskbsdlabel.c:333
#, c-format
msgid "bytes/sector: %ld\n"
msgstr "¥Ð¥¤¥È/¥»¥¯¥¿: %ld\n"
-#: fdisk/fdiskbsdlabel.c:329
+#: fdisk/fdiskbsdlabel.c:334
#, c-format
msgid "sectors/track: %ld\n"
msgstr "¥»¥¯¥¿/¥È¥é¥Ã¥¯: %ld\n"
-#: fdisk/fdiskbsdlabel.c:330
+#: fdisk/fdiskbsdlabel.c:335
#, c-format
msgid "tracks/cylinder: %ld\n"
msgstr "¥È¥é¥Ã¥¯/¥·¥ê¥ó¥À: %ld\n"
-#: fdisk/fdiskbsdlabel.c:331
+#: fdisk/fdiskbsdlabel.c:336
#, c-format
msgid "sectors/cylinder: %ld\n"
msgstr "¥»¥¯¥¿/¥·¥ê¥ó¥À: %ld\n"
-#: fdisk/fdiskbsdlabel.c:332
+#: fdisk/fdiskbsdlabel.c:337
#, c-format
msgid "cylinders: %ld\n"
msgstr "¥·¥ê¥ó¥À: %ld\n"
-#: fdisk/fdiskbsdlabel.c:333
+#: fdisk/fdiskbsdlabel.c:338
#, c-format
msgid "rpm: %d\n"
msgstr "²óž¿ô: %d\n"
-#: fdisk/fdiskbsdlabel.c:334
+#: fdisk/fdiskbsdlabel.c:339
#, c-format
msgid "interleave: %d\n"
msgstr "interleave: %d\n"
-#: fdisk/fdiskbsdlabel.c:335
+#: fdisk/fdiskbsdlabel.c:340
#, c-format
msgid "trackskew: %d\n"
msgstr "trackskew: %d\n"
-#: fdisk/fdiskbsdlabel.c:336
+#: fdisk/fdiskbsdlabel.c:341
#, c-format
msgid "cylinderskew: %d\n"
msgstr "cylinderskew: %d\n"
-#: fdisk/fdiskbsdlabel.c:337
+#: fdisk/fdiskbsdlabel.c:342
#, c-format
msgid "headswitch: %ld\t\t# milliseconds\n"
msgstr "headswitch: %ld\t\t# ¥ß¥êÉÃ\n"
-#: fdisk/fdiskbsdlabel.c:339
+#: fdisk/fdiskbsdlabel.c:344
#, c-format
msgid "track-to-track seek: %ld\t# milliseconds\n"
msgstr "track-to-track seek: %ld\t# ¥ß¥êÉÃ\n"
-#: fdisk/fdiskbsdlabel.c:341
+#: fdisk/fdiskbsdlabel.c:346
msgid "drivedata: "
msgstr "drivedata: "
-#: fdisk/fdiskbsdlabel.c:350
+#: fdisk/fdiskbsdlabel.c:355
#, c-format
msgid ""
"\n"
@@ -2863,98 +3098,98 @@ msgstr ""
"\n"
"%d ¸Ä¤ÎÎΰè:\n"
-#: fdisk/fdiskbsdlabel.c:351
+#: fdisk/fdiskbsdlabel.c:356
msgid "# start end size fstype [fsize bsize cpg]\n"
msgstr "# ³«»Ï ½ªÎ» ¥µ¥¤¥º fs ·¿ [fsize bsize cpg]\n"
-#: fdisk/fdiskbsdlabel.c:400 fdisk/fdiskbsdlabel.c:403
+#: fdisk/fdiskbsdlabel.c:405 fdisk/fdiskbsdlabel.c:408
#, c-format
msgid "Writing disklabel to %s.\n"
msgstr "%s ¤Ë¥Ç¥£¥¹¥¯¥é¥Ù¥ë¤ò½ñ¤­¹þ¤ß¤Þ¤¹¡£\n"
-#: fdisk/fdiskbsdlabel.c:415 fdisk/fdiskbsdlabel.c:417
+#: fdisk/fdiskbsdlabel.c:420 fdisk/fdiskbsdlabel.c:422
#, c-format
msgid "%s contains no disklabel.\n"
msgstr "%s ¤Ï¥Ç¥£¥¹¥¯¥é¥Ù¥ë¤ò´Þ¤ó¤Ç¤¤¤Þ¤»¤ó¡£\n"
-#: fdisk/fdiskbsdlabel.c:422
+#: fdisk/fdiskbsdlabel.c:427
msgid "Do you want to create a disklabel? (y/n) "
msgstr "¥Ç¥£¥¹¥¯¥é¥Ù¥ë¤òºîÀ®¤·¤Þ¤¹¤«? (y/n) "
-#: fdisk/fdiskbsdlabel.c:461
+#: fdisk/fdiskbsdlabel.c:466
msgid "bytes/sector"
msgstr "¥Ð¥¤¥È/¥»¥¯¥¿"
-#: fdisk/fdiskbsdlabel.c:462
+#: fdisk/fdiskbsdlabel.c:467
msgid "sectors/track"
msgstr "¥»¥¯¥¿/¥È¥é¥Ã¥¯"
-#: fdisk/fdiskbsdlabel.c:463
+#: fdisk/fdiskbsdlabel.c:468
msgid "tracks/cylinder"
msgstr "¥È¥é¥Ã¥¯/¥·¥ê¥ó¥À"
-#: fdisk/fdiskbsdlabel.c:471
+#: fdisk/fdiskbsdlabel.c:476
msgid "sectors/cylinder"
msgstr "¥»¥¯¥¿/¥·¥ê¥ó¥À"
-#: fdisk/fdiskbsdlabel.c:475
+#: fdisk/fdiskbsdlabel.c:480
msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
msgstr ""
"¥Ç¥Õ¥©¥ë¥È¤Ç sectors/track * tracks/cylinder °Ê²¼¤Ç¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¡£\n"
-#: fdisk/fdiskbsdlabel.c:477
+#: fdisk/fdiskbsdlabel.c:482
msgid "rpm"
msgstr "rpm"
-#: fdisk/fdiskbsdlabel.c:478
+#: fdisk/fdiskbsdlabel.c:483
msgid "interleave"
msgstr "interleave"
-#: fdisk/fdiskbsdlabel.c:479
+#: fdisk/fdiskbsdlabel.c:484
msgid "trackskew"
msgstr "trackskew"
-#: fdisk/fdiskbsdlabel.c:480
+#: fdisk/fdiskbsdlabel.c:485
msgid "cylinderskew"
msgstr "cylinderskew"
-#: fdisk/fdiskbsdlabel.c:481
+#: fdisk/fdiskbsdlabel.c:486
msgid "headswitch"
msgstr "headswitch"
-#: fdisk/fdiskbsdlabel.c:482
+#: fdisk/fdiskbsdlabel.c:487
msgid "track-to-track seek"
msgstr "track-to-track seek"
-#: fdisk/fdiskbsdlabel.c:523
+#: fdisk/fdiskbsdlabel.c:528
#, c-format
msgid "Bootstrap: %sboot -> boot%s (%s): "
msgstr "¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×: %sboot -> boot%s (%s): "
-#: fdisk/fdiskbsdlabel.c:548
+#: fdisk/fdiskbsdlabel.c:553
msgid "Bootstrap overlaps with disk label!\n"
msgstr "¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¤¬¥Ç¥£¥¹¥¯¥é¥Ù¥ë¤È½Å¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡ª\n"
-#: fdisk/fdiskbsdlabel.c:569 fdisk/fdiskbsdlabel.c:571
+#: fdisk/fdiskbsdlabel.c:574 fdisk/fdiskbsdlabel.c:576
#, c-format
msgid "Bootstrap installed on %s.\n"
msgstr "¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¤Ï %s ¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤·¤¿¡£\n"
-#: fdisk/fdiskbsdlabel.c:593
+#: fdisk/fdiskbsdlabel.c:598
#, c-format
msgid "Partition (a-%c): "
msgstr "Îΰè (a-%c): "
-#: fdisk/fdiskbsdlabel.c:624
+#: fdisk/fdiskbsdlabel.c:629
msgid "This partition already exists.\n"
msgstr "¤³¤ÎÎΰè¤Ï¤¹¤Ç¤Ë¸ºß¤·¤Þ¤¹¡£\n"
-#: fdisk/fdiskbsdlabel.c:744
+#: fdisk/fdiskbsdlabel.c:755
#, c-format
msgid "Warning: too many partitions (%d, maximum is %d).\n"
msgstr "·Ù¹ð: Îΰ褬¿¤¹¤®¤Þ¤¹ (%d, ºÇÂç¤Ï %d)¡£\n"
-#: fdisk/fdiskbsdlabel.c:791
+#: fdisk/fdiskbsdlabel.c:803
msgid ""
"\n"
"Syncing disks.\n"
@@ -4895,135 +5130,121 @@ msgstr "getopt (enhanced) 1.1.2\n"
msgid "internal error, contact the author."
msgstr "ÆâÉô¥¨¥é¡¼¡¢ºî¼Ô¤ËÏ¢Íí¤ò¡£"
-#: hwclock/cmos.c:168
+#: hwclock/cmos.c:172
msgid "booted from MILO\n"
msgstr "MILO ¤«¤é¥Ö¡¼¥È¤µ¤ì¤Þ¤·¤¿\n"
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:181
msgid "Ruffian BCD clock\n"
msgstr "Áƹú¤Ê BCD ¥¯¥í¥Ã¥¯\n"
-#: hwclock/cmos.c:193
+#: hwclock/cmos.c:197
#, c-format
msgid "clockport adjusted to 0x%x\n"
msgstr "¥¯¥í¥Ã¥¯¥Ý¡¼¥È¤ò 0x%x ¤Ë½¤Àµ¤·¤Þ¤·¤¿\n"
-#: hwclock/cmos.c:205
+#: hwclock/cmos.c:209
msgid "funky TOY!\n"
msgstr "¥¤¥«¤·¤¿ TOY!\n"
-#: hwclock/cmos.c:259
+#: hwclock/cmos.c:263
#, c-format
msgid "%s: atomic %s failed for 1000 iterations!"
msgstr "%s: ÉÔ²Äʬ¤Ê%s¤Î 1000 ²ó¤ÎÈ¿Éü¤¬¼ºÇÔ!"
-#: hwclock/cmos.c:583
+#: hwclock/cmos.c:587
#, c-format
msgid "Cannot open /dev/port: %s"
msgstr "/dev/port ¤ò³«¤±¤Þ¤»¤ó: %s"
-#: hwclock/cmos.c:590
+#: hwclock/cmos.c:594
msgid "I failed to get permission because I didn't try.\n"
msgstr "µö²Ä¤Î¼èÆÀ¤ò»î¤µ¤Ê¤«¤Ã¤¿¤Î¤Ç¡¢µö²Ä¤Î¼èÆÀ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
-#: hwclock/cmos.c:593
+#: hwclock/cmos.c:597
#, c-format
msgid "%s is unable to get I/O port access: the iopl(3) call failed.\n"
msgstr "%s ¤Ï I/O ¥Ý¡¼¥È¥¢¥¯¥»¥¹¤¬¤Ç¤­¤Þ¤»¤ó: iopl(3) ¥³¡¼¥ë¤Ë¼ºÇÔ¡£\n"
-#: hwclock/cmos.c:596
+#: hwclock/cmos.c:600
msgid "Probably you need root privileges.\n"
msgstr "¶²¤é¤¯¥ë¡¼¥È¸¢¸Â¤¬É¬ÍפǤ¹¡£\n"
-#: hwclock/hwclock.c:219
+#: hwclock/hwclock.c:223
#, c-format
msgid "Assuming hardware clock is kept in %s time.\n"
msgstr "¥Ï¡¼¥É¥¦¥§¥¢»þ·×%s»þ¹ï¤òÊÝ»ý¤·¤Æ¤¤¤ë¤È¤ß¤Ê¤·¤Þ¤¹\n"
-#: hwclock/hwclock.c:220 hwclock/hwclock.c:314
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
msgid "UTC"
msgstr " UTC "
-#: hwclock/hwclock.c:220 hwclock/hwclock.c:313
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
msgid "local"
msgstr "¥í¡¼¥«¥ë"
-#: hwclock/hwclock.c:297
+#: hwclock/hwclock.c:303
#, c-format
msgid "%s: Warning: unrecognized third line in adjtime file\n"
msgstr "%s: ·Ù¹ð: adjtime ¥Õ¥¡¥¤¥ë¤Î»°¹ÔÌܤ¬Ç§¼±¤Ç¤­¤Þ¤»¤ó\n"
-#: hwclock/hwclock.c:299
+#: hwclock/hwclock.c:305
msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
msgstr "(´üÂÔ¤·¤¿¤Î¤Ï: `UTC', `LOCAL' ¤¢¤ë¤¤¤Ï²¿¤â¤Ê¤¤¤«¤Ç¤¹¡£)\n"
-#: hwclock/hwclock.c:308
+#: hwclock/hwclock.c:312
#, c-format
msgid "Last drift adjustment done at %ld seconds after 1969\n"
msgstr "ľÁ°¤Î¤º¤ì¤Î½¤Àµ¤Ï 1969 ǯ°Ê¹ß %ld ÉûþÅÀ¤Ç¹Ô¤Ê¤ï¤ì¤Þ¤·¤¿\n"
-#: hwclock/hwclock.c:310
+#: hwclock/hwclock.c:314
#, c-format
msgid "Last calibration done at %ld seconds after 1969\n"
msgstr "ľÁ°¤ÎÄ´À°¤Ï 1969 ǯ°Ê¹ß %ld ÉûþÅÀ¤Ç¹Ô¤Ê¤ï¤ì¤Þ¤·¤¿\n"
-#: hwclock/hwclock.c:312
+#: hwclock/hwclock.c:316
#, c-format
msgid "Hardware clock is on %s time\n"
msgstr "¥Ï¡¼¥É¥¦¥§¥¢»þ·×¤Ï%s»þ¹ï¤Ç¤¹\n"
-#: hwclock/hwclock.c:314
+#: hwclock/hwclock.c:318
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.
-#.
-#. -----------------------------------------------------------------------------
-#: hwclock/hwclock.c:336
+#: hwclock/hwclock.c:342
msgid "Waiting for clock tick...\n"
msgstr "¥¯¥í¥Ã¥¯¥Á¥Ã¥¯¤òÂԤäƤ¤¤Þ¤¹...\n"
-#: hwclock/hwclock.c:340
+#: hwclock/hwclock.c:346
msgid "...got clock tick\n"
msgstr "¥¯¥í¥Ã¥¯¥Á¥Ã¥¯¤ò¼èÆÀ¤·¤Þ¤·¤¿\n"
-#: hwclock/hwclock.c:391
+#: hwclock/hwclock.c:399
#, c-format
msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
msgstr "¥Ï¡¼¥É¥¦¥§¥¢»þ·×¤ËÉÔÀµ¤ÊÃÍ: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
-#: hwclock/hwclock.c:399
+#: hwclock/hwclock.c:407
#, c-format
msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
msgstr ""
"¥Ï¡¼¥É¥¦¥§¥¢»þ·×»þ¹ï : %4d/%.2d/%.2d %.2d:%.2d:%.2d = 1969 ǯ°ÊÍè %ld ÉÃ\n"
-#: hwclock/hwclock.c:427
+#: hwclock/hwclock.c:435
#, c-format
msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
msgstr "¥Ï¡¼¥É¥¦¥§¥¢»þ·×¤«¤éÆɹþ¤ó¤À»þ¹ï: %4d/%.2d/%.2d %02d:%02d:%02d\n"
-#: hwclock/hwclock.c:454
+#: hwclock/hwclock.c:462
#, c-format
msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
msgstr "¥Ï¡¼¥É¥¦¥§¥¢»þ·×¤ò %.2d:%.2d:%.2d ¤ËÀßÄê = 1969 ǯ°ÊÍè %ld ÉÃ\n"
-#: hwclock/hwclock.c:460
+#: hwclock/hwclock.c:468
msgid "Clock not changed - testing only.\n"
msgstr "¥¯¥í¥Ã¥¯¤òÊѹ¹¤·¤Þ¤»¤ó¤Ç¤·¤¿ -- ¥Æ¥¹¥È¤À¤±¤Ç¤¹¡£\n"
-#: hwclock/hwclock.c:508
+#: hwclock/hwclock.c:516
#, c-format
msgid ""
"Time elapsed since reference time has been %.6f seconds.\n"
@@ -5032,7 +5253,7 @@ msgstr ""
"»þ¹ï¤ò»²¾È¤·¤¿»þÅÀ¤«¤é %.6f É÷вᡣ\n"
"¼¡¤Î´°Á´¤ÊÉäޤÇÃ٤餻¤Þ¤¹¡£\n"
-#: hwclock/hwclock.c:532
+#: hwclock/hwclock.c:540
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"
@@ -5040,20 +5261,20 @@ msgstr ""
"¥Ï¡¼¥É¥¦¥§¥¢»þ·×¥ì¥¸¥¹¥¿¤¬¤ª¤«¤·¤ÊÃÍ(Îã ²¿·î50Æü)¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤«¡¢\n"
"Ê᪤Ǥ­¤Ê¤¤ÈϰϤÎÃÍ(Îã 2095ǯ)¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£\n"
-#: hwclock/hwclock.c:542
+#: hwclock/hwclock.c:550
#, c-format
msgid "%s %.6f seconds\n"
msgstr "%s %.6f ÉÃ\n"
-#: hwclock/hwclock.c:576
+#: hwclock/hwclock.c:584
msgid "No --date option specified.\n"
msgstr "--date ¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
-#: hwclock/hwclock.c:582
+#: hwclock/hwclock.c:590
msgid "--date argument too long\n"
msgstr "--date °ú¿ô¤¬Ä¹¤¹¤®¤Þ¤¹\n"
-#: hwclock/hwclock.c:589
+#: hwclock/hwclock.c:597
msgid ""
"The value of the --date option is not a valid date.\n"
"In particular, it contains quotation marks.\n"
@@ -5061,23 +5282,23 @@ msgstr ""
"--date ¥ª¥×¥·¥ç¥ó¤ÎÃͤ¬Àµ¤·¤¤ÆüÉդǤϤ¢¤ê¤Þ¤»¤ó¡£\n"
"Æäˡ¢¥¯¥©¡¼¥Æ¡¼¥·¥ç¥ó¥Þ¡¼¥¯¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
-#: hwclock/hwclock.c:597
+#: hwclock/hwclock.c:605
#, c-format
msgid "Issuing date command: %s\n"
msgstr "date ¥³¥Þ¥ó¥É¤òȯ¹Ô¤·¤Þ¤¹: %s\n"
-#: hwclock/hwclock.c:601
+#: hwclock/hwclock.c:609
msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
msgstr ""
"/bin/sh ¥·¥§¥ëÆâ¤Ç 'date' ¥×¥í¥°¥é¥à¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó¡£\n"
"popen() ¤¬¼ºÇÔ¤·¤Þ¤·¤¿¡£"
-#: hwclock/hwclock.c:609
+#: hwclock/hwclock.c:617
#, c-format
msgid "response from date command = %s\n"
msgstr "date ¥³¥Þ¥ó¥É¤«¤é¤ÎÊÖÅú = %s\n"
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:619
#, c-format
msgid ""
"The date command issued by %s returned unexpected results.\n"
@@ -5092,7 +5313,7 @@ msgstr ""
"¤½¤ÎÊÖÅú¤Ï:\n"
" %s\n"
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:631
#, c-format
msgid ""
"The date command issued by %s returned something other than an integer where "
@@ -5109,12 +5330,12 @@ msgstr ""
"¤½¤Î±þÅú¤Ï:\n"
" %s\n"
-#: hwclock/hwclock.c:634
+#: hwclock/hwclock.c:642
#, c-format
msgid "date string %s equates to %ld seconds since 1969.\n"
msgstr "date ʸ»úÎó %s ¤ò 1969 ǯ°ÊÍè %ld ÉäȤ·¤Þ¤¹\n"
-#: hwclock/hwclock.c:666
+#: hwclock/hwclock.c:674
msgid ""
"The Hardware Clock does not contain a valid time, so we cannot set the "
"System Time from it.\n"
@@ -5122,48 +5343,55 @@ msgstr ""
"¥Ï¡¼¥É¥¦¥§¥¢»þ·×¤Ï¡¢Àµ¤·¤¤»þ¹ï¤ò´Þ¤ó¤Ç¤¤¤Ê¤¤¤Î¤Ç¡¢¤³¤³¤«¤éÆÀ¤é¤ì¤¿Ãͤò\n"
"¥·¥¹¥Æ¥à»þ¹ï¤ËÀßÄê¤Ç¤­¤Þ¤»¤ó¡£\n"
-#: hwclock/hwclock.c:688
+#: hwclock/hwclock.c:696
msgid "Calling settimeofday:\n"
msgstr "settimeofday ¤ò¸Æ¤Ó½Ð¤·¤Þ¤¹:\n"
-#: hwclock/hwclock.c:689
+#: hwclock/hwclock.c:697
#, c-format
msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
-#: hwclock/hwclock.c:691
+#: hwclock/hwclock.c:699
#, c-format
msgid "\ttz.tz_minuteswest = %d\n"
msgstr "\ttz.tz_minuteswest = %d\n"
-#: hwclock/hwclock.c:694
+#: hwclock/hwclock.c:702
msgid "Not setting system clock because running in test mode.\n"
msgstr "¥Æ¥¹¥È¥â¡¼¥É¤ÇÆ°ºî¤·¤Æ¤¤¤ë¤¿¤á¡¢¥·¥¹¥Æ¥à¥¯¥í¥Ã¥¯¤òÀßÄꤷ¤Þ¤»¤ó¡£\n"
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:711
msgid "Must be superuser to set system clock.\n"
msgstr "¥·¥¹¥Æ¥à¥¯¥í¥Ã¥¯¤òÀßÄꤹ¤ë¤Ë¤Ï¡¢¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£\n"
-#: hwclock/hwclock.c:704
+#: hwclock/hwclock.c:714
msgid "settimeofday() failed"
msgstr "settimeofday() ¸Æ¤Ó½Ð¤·¤Ë¼ºÇÔ"
-#: hwclock/hwclock.c:737
+#: hwclock/hwclock.c:744
msgid ""
"Not adjusting drift factor because the Hardware Clock previously contained "
"garbage.\n"
msgstr "¥Ï¡¼¥É¥¦¥§¥¢»þ¹ï¤Ë°ÊÁ°¤Î¥´¥ß¤¬´Þ¤Þ¤ì¤Æ¤ª¤ê¡¢¤º¤ì¤ò½¤Àµ¤Ç¤­¤Þ¤»¤ó¡£\n"
-#: hwclock/hwclock.c:741
+#: hwclock/hwclock.c:749
+#, fuzzy
+msgid ""
+"Not adjusting drift factor because last calibration time is zero,\n"
+"so history is bad and calibration startover is necessary.\n"
+msgstr "Á°²ó¤ÎÄ´À°°ÊÍè¡¢¾¯¤Ê¤¯¤È¤â°ìÆü·Ð²á¤·¤Ê¤¤¤È¡¢¤º¤ì¤ò½¤Àµ¤Ç¤­¤Þ¤»¤ó¡£\n"
+
+#: hwclock/hwclock.c:755
msgid ""
"Not adjusting drift factor because it has been less than a day since the "
"last calibration.\n"
msgstr "Á°²ó¤ÎÄ´À°°ÊÍè¡¢¾¯¤Ê¤¯¤È¤â°ìÆü·Ð²á¤·¤Ê¤¤¤È¡¢¤º¤ì¤ò½¤Àµ¤Ç¤­¤Þ¤»¤ó¡£\n"
-#: hwclock/hwclock.c:750
-#, c-format
+#: hwclock/hwclock.c:803
+#, fuzzy, c-format
msgid ""
-"Clock drifted %d seconds in the past %d seconds in spite of a drift factor "
+"Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
"of %f seconds/day.\n"
"Adjusting drift factor by %f seconds/day\n"
msgstr ""
@@ -5171,21 +5399,21 @@ msgstr ""
"É交ì¤Þ¤·¤¿¡£\n"
"°ìÆü¤¢¤¿¤ê %4$f É交ì¤ò½¤Àµ¤·¤Þ¤¹\n"
-#: hwclock/hwclock.c:801
+#: hwclock/hwclock.c:854
#, c-format
msgid "Time since last adjustment is %d seconds\n"
msgstr "Á°²ó¤Î½¤Àµ¤«¤é¤Î»þ´Ö¤Ï %d ÉäǤ¹\n"
-#: hwclock/hwclock.c:803
+#: hwclock/hwclock.c:856
#, c-format
msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
msgstr "%d ÉäÎÁÞÆþ¤È¡¢%.6f ÉÃÁ°¤Î»þ¹ï¤Î»²¾È¤¬É¬ÍפǤ¹\n"
-#: hwclock/hwclock.c:832
+#: hwclock/hwclock.c:885
msgid "Not updating adjtime file because of testing mode.\n"
msgstr "¥Æ¥¹¥È¥â¡¼¥É¤ÇÆ°ºî¤·¤Æ¤¤¤ë¤¿¤á adjtime ¥Õ¥¡¥¤¥ë¤ò¹¹¿·¤·¤Þ¤»¤ó¡£\n"
-#: hwclock/hwclock.c:833
+#: hwclock/hwclock.c:886
#, c-format
msgid ""
"Would have written the following to %s:\n"
@@ -5194,33 +5422,33 @@ msgstr ""
"ËÜÍè¤Ê¤é¤Ð %s ¤Ë°Ê²¼¤Î¤è¤¦¤Ë½ñ¤­¹þ¤Þ¤ì¤ë¤Ï¤º¤Ç¤·¤¿:\n"
"%s"
-#: hwclock/hwclock.c:857
+#: hwclock/hwclock.c:910
msgid "Drift adjustment parameters not updated.\n"
msgstr "¤º¤ì¤Î½¤ÀµÃͤϹ¹¿·¤µ¤ì¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
-#: hwclock/hwclock.c:898
+#: hwclock/hwclock.c:951
msgid ""
"The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
msgstr "¥Ï¡¼¥É¥¦¥§¥¢»þ·×¤¬¡¢Àµ¾ï¤Ê»þ¹ï¤ò´Þ¤ó¤Ç¤¤¤Ê¤¤¤Î¤Ç¡¢½¤Àµ¤Ç¤­¤Þ¤»¤ó¡£\n"
-#: hwclock/hwclock.c:922
+#: hwclock/hwclock.c:983
msgid "Needed adjustment is less than one second, so not setting clock.\n"
msgstr "ɬÍפʽ¤Àµ¤¬°ìÉÃ̤Ëþ¤Ê¤Î¤Ç¡¢¥¯¥í¥Ã¥¯¤òÀßÄꤷ¤Þ¤»¤ó¡£\n"
-#: hwclock/hwclock.c:948
+#: hwclock/hwclock.c:1009
#, c-format
msgid "Using %s.\n"
msgstr "%s ¤ò»È¤¤¤Þ¤¹¡£\n"
-#: hwclock/hwclock.c:950
+#: hwclock/hwclock.c:1011
msgid "No usable clock interface found.\n"
msgstr "ÍøÍѲÄǽ¤Ê¥¯¥í¥Ã¥¯¥¤¥ó¥¿¡¼¥Õ¥§¥¤¥¹¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£\n"
-#: hwclock/hwclock.c:1045
+#: hwclock/hwclock.c:1107
msgid "Unable to set system clock.\n"
msgstr "¥·¥¹¥Æ¥à¥¯¥í¥Ã¥¯¤òÀßÄê¤Ç¤­¤Þ¤»¤ó¡£\n"
-#: hwclock/hwclock.c:1076
+#: hwclock/hwclock.c:1137
msgid ""
"The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
"machine.\n"
@@ -5232,16 +5460,16 @@ msgstr ""
"¤³¤Î hwclock ¤ÎÊ£À½¤Ï Alpha °Ê³°¤Î¥Þ¥·¥ó¤Ç¥Ó¥ë¥É¤µ¤ì¤Þ¤·¤¿\n"
"(¤½¤·¤ÆÅöÁ³¡¢¸½ºß Alpha ¾å¤Ç¼Â¹Ô¤µ¤ì¤Æ¤¤¤Þ¤»¤ó)¡£¼Â¹Ô¤Ç¤­¤Þ¤»¤ó¡£\n"
-#: hwclock/hwclock.c:1085
+#: hwclock/hwclock.c:1146
msgid "Unable to get the epoch value from the kernel.\n"
msgstr "¥«¡¼¥Í¥ë¤«¤é¥¨¥Ý¥Ã¥¯Ãͤò¼èÆÀ¤Ç¤­¤Þ¤»¤ó¡£\n"
-#: hwclock/hwclock.c:1087
+#: hwclock/hwclock.c:1148
#, c-format
msgid "Kernel is assuming an epoch value of %lu\n"
msgstr "¥«¡¼¥Í¥ë¤Ï¥¨¥Ý¥Ã¥¯Ãͤò %lu ¤ÈÁÛÄꤷ¤Æ¤¤¤Þ¤¹\n"
-#: hwclock/hwclock.c:1090
+#: hwclock/hwclock.c:1151
msgid ""
"To set the epoch value, you must use the 'epoch' option to tell to what "
"value to set it.\n"
@@ -5249,16 +5477,16 @@ msgstr ""
"¥¨¥Ý¥Ã¥¯ÃͤòÀßÄꤹ¤ë¤¿¤á¤Ë¤Ï¡¢²¿¤ÎÃͤòÀßÄꤹ¤ë¤«¤òÃΤ餻¤ë¤¿¤á¤Ë 'epoch'\n"
"¥ª¥×¥·¥ç¥ó¤ò»È¤ï¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£\n"
-#: hwclock/hwclock.c:1093
+#: hwclock/hwclock.c:1154
#, c-format
msgid "Not setting the epoch to %d - testing only.\n"
msgstr "¥¨¥Ý¥Ã¥¯¤ò %d ¤ËÀßÄꤷ¤Þ¤»¤ó -- ¥Æ¥¹¥È¤À¤±¤Ç¤¹¡£\n"
-#: hwclock/hwclock.c:1096
+#: hwclock/hwclock.c:1157
msgid "Unable to set the epoch value in the kernel.\n"
msgstr "¥«¡¼¥Í¥ë¤Ë¥¨¥Ý¥Ã¥¯ÃͤòÀßÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
-#: hwclock/hwclock.c:1125
+#: hwclock/hwclock.c:1191
#, c-format
msgid ""
"hwclock - query and set the hardware clock (RTC)\n"
@@ -5317,7 +5545,7 @@ msgstr ""
" -noadjfile /etc/adjtime ¤Ë¥¢¥¯¥»¥¹¤·¤Ê¤¤¡£--utc Ëô¤Ï --localtime\n"
" ¤Î¤¤¤º¤ì¤«¤Î»ÈÍѤòɬÍפȤ¹¤ë\n"
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1218
msgid ""
" --jensen, --arc, --srm, --funky-toy\n"
" tell hwclock the type of alpha you have (see hwclock(8))\n"
@@ -5325,20 +5553,21 @@ msgstr ""
" --jensen, --arc, --srm, --funky-toy\n"
" ¤¢¤Ê¤¿¤Î alpha ¤Î¥¿¥¤¥×¤ò»Ø¼¨¤¹¤ë (hwclock(8) »²¾È)\n"
-#: hwclock/hwclock.c:1257
+#: hwclock/hwclock.c:1392
#, c-format
msgid "%s takes no non-option arguments. You supplied %d.\n"
msgstr "%s ¤Ï²¿¤é¤«¤Î¥ª¥×¥·¥ç¥ó°ú¿ô¤ò¼è¤ê¤Þ¤¹¡£¤¢¤Ê¤¿¤Ï %d ¸ÄÍ¿¤¨¤Þ¤·¤¿¡£\n"
-#: hwclock/hwclock.c:1267
+#: hwclock/hwclock.c:1398
+#, fuzzy
msgid ""
-"You have specified multiple function options.\n"
+"You have specified multiple functions.\n"
"You can only perform one function at a time.\n"
msgstr ""
"¤¢¤Ê¤¿¤Ïµ¡Ç½¥ª¥×¥·¥ç¥ó¤òÊ£¿ô¸Ä»ØÄꤷ¤Þ¤·¤¿¡£\n"
"°ìÅ٤˰ì¤Ä¤Îµ¡Ç½¤Î¤ß¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£\n"
-#: hwclock/hwclock.c:1273
+#: hwclock/hwclock.c:1405
#, c-format
msgid ""
"%s: The --utc and --localtime options are mutually exclusive. You specified "
@@ -5347,7 +5576,7 @@ msgstr ""
"%s: --utc ¤È --localtime ¥ª¥×¥·¥ç¥ó¤ÏÁê¸ßÇÓ¾Ū¤Ç¤¹¤¬¡¢Î¾Êý¤¬»ØÄꤵ¤ì¤Þ¤·"
"¤¿¡£\n"
-#: hwclock/hwclock.c:1279
+#: hwclock/hwclock.c:1412
#, c-format
msgid ""
"%s: The --adjust and --noadjfile options are mutually exclusive. You "
@@ -5356,27 +5585,27 @@ msgstr ""
"%s: --adjust ¤È --noadjfile ¥ª¥×¥·¥ç¥ó¤ÏÁê¸ßÇÓ¾Ū¤Ç¤¹¤¬¡¢Î¾Êý¤¬»ØÄꤵ¤ì¤Þ¤·"
"¤¿¡£\n"
-#: hwclock/hwclock.c:1285
+#: hwclock/hwclock.c:1419
#, c-format
msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
msgstr ""
"%s: --noadjfile ¤ò¤Ä¤±¤¿¾ì¹ç¡¢--utc ¤« --localtime ¤Î¤¤¤º¤ì¤«¤ò»ØÄꤷ¤Ê¤±¤ì¤Ð"
"¤Ê¤ê¤Þ¤»¤ó\n"
-#: hwclock/hwclock.c:1298
+#: hwclock/hwclock.c:1433
msgid "No usable set-to time. Cannot set clock.\n"
msgstr "Í­¸ú¤ÊÀßÄê»þ¹ï¤¬¤¢¤ê¤Þ¤»¤ó¡£¥¯¥í¥Ã¥¯¤òÀßÄê¤Ç¤­¤Þ¤»¤ó¡£\n"
-#: hwclock/hwclock.c:1313
+#: hwclock/hwclock.c:1449
msgid "Sorry, only the superuser can change the Hardware Clock.\n"
msgstr ""
"»ÄÇ°¤Ê¤¬¤é¡¢¥Ï¡¼¥É¥¦¥§¥¢¥¯»þ·×¤ÎÊѹ¹¤Ï¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¤Ç¤·¤«¹Ô¤Ê¤¨¤Þ¤»¤ó¡£\n"
-#: hwclock/hwclock.c:1317
+#: hwclock/hwclock.c:1454
msgid "Sorry, only the superuser can change the System Clock.\n"
msgstr "»ÄÇ°¤Ê¤¬¤é¡¢¥·¥¹¥Æ¥à»þ·×¤ÎÊѹ¹¤Ï¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¤Ç¤·¤«¹Ô¤Ê¤¨¤Þ¤»¤ó¡£\n"
-#: hwclock/hwclock.c:1321
+#: hwclock/hwclock.c:1459
msgid ""
"Sorry, only the superuser can change the Hardware Clock epoch in the "
"kernel.\n"
@@ -5384,106 +5613,101 @@ msgstr ""
"»ÄÇ°¤Ê¤¬¤é¡¢¥«¡¼¥Í¥ëÆâ¤Î¥Ï¡¼¥É¥¦¥§¥¢»þ·×¤Î¥¨¥Ý¥Ã¥¯ÃͤòÊѹ¹¤Ç¤­¤ë¤Î¤Ï¡¢\n"
"¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¤À¤±¤Ç¤¹¡£\n"
-#: hwclock/hwclock.c:1341
+#: hwclock/hwclock.c:1479
msgid "Cannot access the Hardware Clock via any known method.\n"
msgstr "´ûÃΤΤɤó¤ÊÊýË¡¤Ç¤â¡¢¥Ï¡¼¥É¥¦¥§¥¢»þ·×¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤»¤ó¡£\n"
-#: hwclock/hwclock.c:1344
+#: hwclock/hwclock.c:1483
msgid ""
"Use the --debug option to see the details of our search for an access "
"method.\n"
msgstr "--debug ¥ª¥×¥·¥ç¥ó¤Ç¥¢¥¯¥»¥¹ÊýË¡¸¡º÷¤Î¾ÜºÙ¤Ë¤Ä¤¤¤Æ¸«¤Æ¤¯¤À¤µ¤¤¡£\n"
-#: hwclock/kd.c:42
+#: hwclock/kd.c:43
msgid "Waiting in loop for time from KDGHWCLK to change\n"
msgstr "KDGHWCLK ¤«¤éÊѹ¹¤Î¤¿¤á¤Î»þ¹ï¤ò¼èÆÀ¤¹¤ë¥ë¡¼¥×Ãæ¤Ç¤¹\n"
-#: hwclock/kd.c:45
+#: hwclock/kd.c:46
msgid "KDGHWCLK ioctl to read time failed"
msgstr "KDGHWCLK ¤Î»þ¹ïÆɤ߼è¤ê¤¬¼ºÇÔ¤·¤Þ¤·¤¿"
-#: hwclock/kd.c:66 hwclock/rtc.c:174
+#: hwclock/kd.c:67 hwclock/rtc.c:187
msgid "Timed out waiting for time change.\n"
msgstr "»þ¹ïÊѹ¹ÂÔ¤Á¤¬¥¿¥¤¥à¥¢¥¦¥È¤·¤Þ¤·¤¿¡£\n"
-#: hwclock/kd.c:70
+#: hwclock/kd.c:71
msgid "KDGHWCLK ioctl to read time failed in loop"
msgstr "»þ¹ïÆɤ߹þ¤ß¤Î¤¿¤á¤Î KDGHWCLK ioctl ¤¬¥ë¡¼¥×Æâ¤Ç¼ºÇÔ¤·¤Þ¤·¤¿"
-#: hwclock/kd.c:92
+#: hwclock/kd.c:93
#, c-format
msgid "ioctl() failed to read time from %s"
msgstr "%s ¤«¤é»þ¹ï¤òÆɹþ¤à¤¿¤á¤Î ioctl() ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
-#: hwclock/kd.c:128
+#: hwclock/kd.c:129
msgid "ioctl KDSHWCLK failed"
msgstr "KDSHWCLK ioctl ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
-#: hwclock/kd.c:165
+#: hwclock/kd.c:166
msgid "Can't open /dev/tty1 or /dev/vc/1"
msgstr "/dev/tty1 ¤Þ¤¿¤Ï /dev/vc/1 ¤ò³«¤±¤Þ¤»¤ó"
-#: hwclock/kd.c:170
+#: hwclock/kd.c:171
msgid "KDGHWCLK ioctl failed"
msgstr "KDGHWCLK ioctl ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
-#: hwclock/rtc.c:136
+#: hwclock/rtc.c:115 hwclock/rtc.c:208
+#, c-format
+msgid "open() of %s failed"
+msgstr "%s ¤Ø¤Î open() ¤¬¼ºÇÔ¤·¤Þ¤·¤¿"
+
+#: hwclock/rtc.c:149
#, c-format
msgid "ioctl() to %s to read the time failed.\n"
msgstr "»þ¹ïÆɤ߹þ¤ß¤Î¤¿¤á¤Î %s ¤Ø¤Î ioctl() ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
-#: hwclock/rtc.c:158
+#: hwclock/rtc.c:171
#, c-format
msgid "Waiting in loop for time from %s to change\n"
msgstr "%s ¤«¤é»þ¹ï¤òÊѹ¹¤¹¤ë¤¿¤á¤Î¥ë¡¼¥×Ãæ¤Ç¤¹\n"
-#: hwclock/rtc.c:195 hwclock/rtc.c:250
-#, c-format
-msgid "open() of %s failed"
-msgstr "%s ¤Ø¤Î open() ¤¬¼ºÇÔ¤·¤Þ¤·¤¿"
-
-#: hwclock/rtc.c:213
+#: hwclock/rtc.c:226
#, c-format
msgid "%s does not have interrupt functions. "
msgstr "%s ¤Ï³ä¤ê¹þ¤ßµ¡Ç½¤ò»ý¤Ã¤Æ¤¤¤Þ¤»¤ó¡£ "
-#: hwclock/rtc.c:222
+#: hwclock/rtc.c:235
#, c-format
msgid "read() to %s to wait for clock tick failed"
msgstr "¥¯¥í¥Ã¥¯¥Á¥Ã¥¯¤òÂԤĤ¿¤á¤Î %s ¤Ø¤Î read() ¤¬¼ºÇÔ¤·¤Þ¤·¤¿"
-#: hwclock/rtc.c:231
+#: hwclock/rtc.c:244
#, c-format
msgid "ioctl() to %s to turn off update interrupts failed"
msgstr "³ä¤ê¹þ¤ß¹¹¿·¤ò¥ª¥Õ¤Ë¤¹¤ë¤¿¤á¤Î %s ¤Ø¤Î ioctl() ¤¬¼ºÇÔ¤·¤Þ¤·¤¿"
-#: hwclock/rtc.c:234
+#: hwclock/rtc.c:247
#, c-format
msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
msgstr ""
"³ä¤ê¹þ¤ß¹¹¿·¤ò¥ª¥ó¤Ë¤¹¤ë¤¿¤á¤Î %s ¤Ø¤Î ioctl() ¤¬Í½´ü¤»¤Ì¼ºÇԤ˽ª¤ï¤ê¤Þ¤·¤¿"
-#: hwclock/rtc.c:274 hwclock/rtc.c:358 hwclock/rtc.c:404
-#, c-format
-msgid "Unable to open %s"
-msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó"
-
-#: hwclock/rtc.c:300
+#: hwclock/rtc.c:306
#, c-format
msgid "ioctl() to %s to set the time failed.\n"
msgstr "»þ¹ïÀßÄê¤Î¤¿¤á¤Î %s ¤Ø¤Î ioctl() ¤¬¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
-#: hwclock/rtc.c:306
+#: hwclock/rtc.c:312
#, c-format
msgid "ioctl(%s) was successful.\n"
msgstr "ioctl(%s) ¤ËÀ®¸ù¤·¤Þ¤·¤¿¡£\n"
-#: hwclock/rtc.c:335
+#: hwclock/rtc.c:341
#, c-format
msgid "Open of %s failed"
msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
-#: hwclock/rtc.c:353 hwclock/rtc.c:399
+#: hwclock/rtc.c:359 hwclock/rtc.c:405
#, c-format
msgid ""
"To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
@@ -5494,12 +5718,17 @@ msgstr ""
"Linux ¤Î 'rtc' ¥Ç¥Ð¥¤¥¹¥É¥é¥¤¥Ð¤Ë¥¢¥¯¥»¥¹¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤·¤«¤·¡¢¤³¤Î\n"
"¥Õ¥¡¥¤¥ë¤¬¥·¥¹¥Æ¥à¤Ë¸ºß¤·¤Þ¤»¤ó¡£\n"
-#: hwclock/rtc.c:365
+#: hwclock/rtc.c:364 hwclock/rtc.c:410
+#, c-format
+msgid "Unable to open %s"
+msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó"
+
+#: hwclock/rtc.c:371
#, c-format
msgid "ioctl(RTC_EPOCH_READ) to %s failed"
msgstr "%s ¤Ø¤Î ioctl(RTC_EPOCH_READ) ¤¬¼ºÇÔ¤·¤Þ¤·¤¿"
-#: hwclock/rtc.c:371
+#: hwclock/rtc.c:377
#, c-format
msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
msgstr ""
@@ -5508,59 +5737,29 @@ msgstr ""
#. kernel would not accept this epoch value
#. Hmm - bad habit, deciding not to do what the user asks
#. just because one believes that the kernel might not like it.
-#: hwclock/rtc.c:391
+#: hwclock/rtc.c:397
#, c-format
msgid "The epoch value may not be less than 1900. You requested %ld\n"
msgstr ""
"¥¨¥Ý¥Ã¥¯ÃÍ¤Ï 1900 ǯ°ÊÁ°¤Ç¤Ï¤¢¤êÆÀ¤Þ¤»¤ó¡£¤¢¤Ê¤¿¤Ï %ld ¤òÍ׵ᤷ¤Þ¤·¤¿\n"
-#: hwclock/rtc.c:409
+#: hwclock/rtc.c:415
#, c-format
msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
msgstr ""
"%2$s ¤«¤é RTC_EPOCH_READ ioctl ¤Ë¤è¤Ã¤Æ¥¨¥Ý¥Ã¥¯ %1$ld ¤òÆɤ߼è¤ê¤Þ¤·¤¿¡£\n"
-#: hwclock/rtc.c:414
+#: hwclock/rtc.c:420
#, c-format
msgid ""
"The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
msgstr "%s ¤Î¥«¡¼¥Í¥ë¥É¥é¥¤¥Ð¤Ï RTC_EPOCH_SET ioctl ¤ò»ý¤Ã¤Æ¤¤¤Þ¤»¤ó¡£\n"
-#: hwclock/rtc.c:417
+#: hwclock/rtc.c:423
#, c-format
msgid "ioctl(RTC_EPOCH_SET) to %s failed"
msgstr "%s ¤Ø¤Î ioctl(RTC_EPOCH_SET) ¤¬¼ºÇÔ¤·¤Þ¤·¤¿"
-#: hwclock/shhopt.c:255 hwclock/shhopt.c:281
-#, c-format
-msgid "invalid number `%s'\n"
-msgstr "ÉÔÀµ¤ÊÃÍ `%s'\n"
-
-#: hwclock/shhopt.c:258 hwclock/shhopt.c:284
-#, c-format
-msgid "number `%s' to `%s' out of range\n"
-msgstr "ÃÍ `%s' ¤Ï `%s' ¤Ë¤È¤Ã¤ÆÈϰϳ°¤Ç¤¹\n"
-
-#: hwclock/shhopt.c:398
-#, c-format
-msgid "unrecognized option `%s'\n"
-msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥ª¥×¥·¥ç¥ó `%s' ¤Ç¤¹\n"
-
-#: hwclock/shhopt.c:411 hwclock/shhopt.c:449
-#, c-format
-msgid "option `%s' requires an argument\n"
-msgstr "¥ª¥×¥·¥ç¥ó `%s' ¤Ï°ú¿ô¤òÍ׵ᤷ¤Þ¤¹\n"
-
-#: hwclock/shhopt.c:417
-#, c-format
-msgid "option `%s' doesn't allow an argument\n"
-msgstr "¥ª¥×¥·¥ç¥ó `%s' ¤Ï°ú¿ô¤ò¼õ¤±ÉÕ¤±¤Þ¤»¤ó\n"
-
-#: hwclock/shhopt.c:439
-#, c-format
-msgid "unrecognized option `-%c'\n"
-msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥ª¥×¥·¥ç¥ó `-%c' ¤Ç¤¹\n"
-
#: login-utils/agetty.c:312
msgid "calling open_tty\n"
msgstr "open_tty ¤Î¸Æ¤Ó½Ð¤·Ãæ\n"
@@ -6594,7 +6793,7 @@ msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Î¥ª¡¼¥×¥ó¤¬¼ºÇÔ¤·¤Þ¤·¤¿\n"
msgid "fork failed\n"
msgstr "fork ¤¬¼ºÇÔ\n"
-#: login-utils/simpleinit.c:512 text-utils/more.c:1705
+#: login-utils/simpleinit.c:512 text-utils/more.c:1706
msgid "exec failed\n"
msgstr "¼Â¹Ô¤Ë¼ºÇÔ\n"
@@ -7380,160 +7579,160 @@ msgstr "[mntent]: %2$s ¤Î %1$d ¹ÔÌܤÏÉÔÀµ¤Ç¤¹%3$s\n"
msgid "; rest of file ignored"
msgstr "-- ̵»ë¤·¤Þ¤¹"
-#: mount/mount.c:379
+#: mount/mount.c:381
#, c-format
msgid "mount: according to mtab, %s is already mounted on %s"
msgstr "mount: mtab ¤Ë¤è¤ë¤È¡¢%s ¤Ï %s ¤Ë¥Þ¥¦¥ó¥ÈºÑ¤Ç¤¹"
-#: mount/mount.c:383
+#: mount/mount.c:385
#, c-format
msgid "mount: according to mtab, %s is mounted on %s"
msgstr "mount: mtab ¤Ë¤è¤ë¤È¡¢%s ¤Ï %s ¤Ë¥Þ¥¦¥ó¥È¤µ¤ì¤Æ¤¤¤Þ¤¹"
-#: mount/mount.c:404
+#: mount/mount.c:406
#, c-format
msgid "mount: can't open %s for writing: %s"
msgstr "mount: %s ¤ò½ñ¤­¹þ¤ßÍѤ˥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s"
-#: mount/mount.c:419 mount/mount.c:638
+#: mount/mount.c:421 mount/mount.c:640
#, c-format
msgid "mount: error writing %s: %s"
msgstr "mount: %s ¤Î½ñ¤­¹þ¤ß¥¨¥é¡¼: %s"
-#: mount/mount.c:426
+#: mount/mount.c:428
#, c-format
msgid "mount: error changing mode of %s: %s"
msgstr "mount: %s ¤Î¥â¡¼¥ÉÊѹ¹¥¨¥é¡¼: %s"
-#: mount/mount.c:472
+#: mount/mount.c:474
#, c-format
msgid "%s looks like swapspace - not mounted"
msgstr "%s ¤Ï¥¹¥ï¥Ã¥×¶õ´Ö¤Î¤è¤¦¤Ç¤¹¤Í -- ¥Þ¥¦¥ó¥È¤·¤Þ¤»¤ó"
-#: mount/mount.c:532
+#: mount/mount.c:534
msgid "mount failed"
msgstr "¥Þ¥¦¥ó¥È¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
-#: mount/mount.c:534
+#: mount/mount.c:536
#, c-format
msgid "mount: only root can mount %s on %s"
msgstr "mount: root ¤À¤±¤¬ %s ¤ò %s ¤Ë¥Þ¥¦¥ó¥È¤Ç¤­¤Þ¤¹"
-#: mount/mount.c:562
+#: mount/mount.c:564
msgid "mount: loop device specified twice"
msgstr "mount: loop ¥Ç¥Ð¥¤¥¹¤¬ 2 ²ó»ØÄꤵ¤ì¤Þ¤·¤¿"
-#: mount/mount.c:567
+#: mount/mount.c:569
msgid "mount: type specified twice"
msgstr "mount: ¥¿¥¤¥×¤¬ 2 ²ó»ØÄꤵ¤ì¤Þ¤·¤¿"
-#: mount/mount.c:579
+#: mount/mount.c:581
msgid "mount: skipping the setup of a loop device\n"
msgstr "mount: loop ¥Ç¥Ð¥¤¥¹¤ÎÀßÄê¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹\n"
-#: mount/mount.c:588
+#: mount/mount.c:590
#, c-format
msgid "mount: going to use the loop device %s\n"
msgstr "mount: loop ¥Ç¥Ð¥¤¥¹ %s ¤ò»È¤¤¤Þ¤¹\n"
-#: mount/mount.c:592
+#: mount/mount.c:594
msgid "mount: failed setting up loop device\n"
msgstr "mount: loop ¥Ç¥Ð¥¤¥¹¤ÎÀßÄê¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
-#: mount/mount.c:596
+#: mount/mount.c:598
msgid "mount: setup loop device successfully\n"
msgstr "mount: loop ¥Ç¥Ð¥¤¥¹¤ÎÀßÄê¤ËÀ®¸ù¤·¤Þ¤·¤¿\n"
-#: mount/mount.c:633
+#: mount/mount.c:635
#, c-format
msgid "mount: can't open %s: %s"
msgstr "mount: %s ¤¬¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s"
-#: mount/mount.c:656
+#: mount/mount.c:658
#, c-format
msgid "mount: cannot open %s for setting speed"
msgstr "mount: %s ¤ò®ÅÙÀßÄêÍѤ˥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó"
-#: mount/mount.c:659
+#: mount/mount.c:661
#, c-format
msgid "mount: cannot set speed: %s"
msgstr "mount: ®ÅÙ¤ÎÀßÄ꤬¤Ç¤­¤Þ¤»¤ó: %s"
-#: mount/mount.c:720 mount/mount.c:1265
+#: mount/mount.c:722 mount/mount.c:1295
#, c-format
msgid "mount: cannot fork: %s"
msgstr "mount: fork ¤Ç¤­¤Þ¤»¤ó: %s"
-#: mount/mount.c:800
+#: mount/mount.c:802
msgid "mount: this version was compiled without support for the type `nfs'"
msgstr ""
"mount: ¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Ï 'nfs' ¥¿¥¤¥×¤Î¥µ¥Ý¡¼¥È¤Ê¤·¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹"
-#: mount/mount.c:839
+#: mount/mount.c:841
msgid "mount: failed with nfs mount version 4, trying 3..\n"
msgstr "mount: nfs mount version 4 ¤Ç¤Ï¼ºÇÔ¤·¤Þ¤·¤¿¡£3 ¤ò»î¤·¤Þ¤¹..\n"
-#: mount/mount.c:850
+#: mount/mount.c:852
msgid ""
"mount: I could not determine the filesystem type, and none was specified"
msgstr "mount: none ¤¬»ØÄꤵ¤ì¤Þ¤·¤¿¤¬¡¢¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥¿¥¤¥×¤ò·èÄê¤Ç¤­¤Þ¤»¤ó"
-#: mount/mount.c:853
+#: mount/mount.c:855
msgid "mount: you must specify the filesystem type"
msgstr "mount: ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥¿¥¤¥×¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹"
#. should not happen
-#: mount/mount.c:856
+#: mount/mount.c:858
msgid "mount: mount failed"
msgstr "mount: ¥Þ¥¦¥ó¥È¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
-#: mount/mount.c:862 mount/mount.c:897
+#: mount/mount.c:864 mount/mount.c:899
#, c-format
msgid "mount: mount point %s is not a directory"
msgstr "mount: ¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È %s ¤Ï¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
-#: mount/mount.c:864
+#: mount/mount.c:866
msgid "mount: permission denied"
msgstr "mount: µö²Ä¤¬¤¢¤ê¤Þ¤»¤ó"
-#: mount/mount.c:866
+#: mount/mount.c:868
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:870 mount/mount.c:874
+#: mount/mount.c:872 mount/mount.c:876
#, c-format
msgid "mount: %s is busy"
msgstr "mount: %s ¤Ï»ÈÍÑÃæ¤Ç¤¹"
#. no
#. yes, don't mention it
-#: mount/mount.c:876
+#: mount/mount.c:878
msgid "mount: proc already mounted"
msgstr "mount: proc ¤Ï¥Þ¥¦¥ó¥ÈºÑ¤Ç¤¹"
-#: mount/mount.c:878
+#: mount/mount.c:880
#, c-format
msgid "mount: %s already mounted or %s busy"
msgstr "mount: %s ¤Ï ¥Þ¥¦¥ó¥ÈºÑ¤« %s ¤¬»ÈÍÑÃæ¤Ç¤¹"
-#: mount/mount.c:884
+#: mount/mount.c:886
#, c-format
msgid "mount: mount point %s does not exist"
msgstr "mount: ¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È %s ¤¬Â¸ºß¤·¤Þ¤»¤ó"
-#: mount/mount.c:886
+#: mount/mount.c:888
#, c-format
msgid "mount: mount point %s is a symbolic link to nowhere"
msgstr "mount: ¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È %s ¤Ï¤É¤³¤â¤µ¤·¤Æ¤¤¤Ê¤¤¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤Ç¤¹"
-#: mount/mount.c:889
+#: mount/mount.c:891
#, c-format
msgid "mount: special device %s does not exist"
msgstr "mount: ¥¹¥Ú¥·¥ã¥ë¥Ç¥Ð¥¤¥¹ %s ¤¬Â¸ºß¤·¤Þ¤»¤ó"
-#: mount/mount.c:899
+#: mount/mount.c:901
#, c-format
msgid ""
"mount: special device %s does not exist\n"
@@ -7542,12 +7741,12 @@ msgstr ""
"mount: ¥¹¥Ú¥·¥ã¥ë¥Ç¥Ð¥¤¥¹ %s ¤¬Â¸ºß¤·¤Þ¤»¤ó\n"
" (¥Ñ¥¹¤Î¥Ç¥£¥ì¥¯¥È¥ê¤¬¤¢¤ê¤Þ¤»¤ó)\n"
-#: mount/mount.c:912
+#: mount/mount.c:914
#, c-format
msgid "mount: %s not mounted already, or bad option"
msgstr "mount: %s ¤Ï¤Þ¤À¥Þ¥¦¥ó¥È¤µ¤ì¤Æ¤¤¤Ê¤¤¤«¡¢ÉÔÀµ¤Ê¥ª¥×¥·¥ç¥ó¤Ç¤¹"
-#: mount/mount.c:914
+#: mount/mount.c:916
#, c-format
msgid ""
"mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -7557,35 +7756,35 @@ msgstr ""
" %s ¤Î¥¹¡¼¥Ñ¡¼¥Ö¥í¥Ã¥¯¤¬ÉÔÀµ¡¢°¿¤¤¤Ï¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥Þ¥¦¥ó¥È\n"
" ¤¬Â¿¤¹¤®¤Þ¤¹"
-#: mount/mount.c:948
+#: mount/mount.c:950
msgid "mount table full"
msgstr "¥Þ¥¦¥ó¥È¥Æ¡¼¥Ö¥ë¤¬¤¤¤Ã¤Ñ¤¤¤Ç¤¹"
-#: mount/mount.c:950
+#: mount/mount.c:952
#, c-format
msgid "mount: %s: can't read superblock"
msgstr "mount: %s: ¥¹¡¼¥Ñ¡¼¥Ö¥í¥Ã¥¯¤òÆɤá¤Þ¤»¤ó"
-#: mount/mount.c:954
+#: mount/mount.c:956
#, c-format
msgid "mount: %s: unknown device"
msgstr "mount: %s: ÉÔÌÀ¤Ê¥Ç¥Ð¥¤¥¹¤Ç¤¹"
-#: mount/mount.c:959
+#: mount/mount.c:961
#, c-format
msgid "mount: fs type %s not supported by kernel"
msgstr "mount: ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥¿¥¤¥× %s ¤Ï¥«¡¼¥Í¥ë¤¬¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó"
-#: mount/mount.c:971
+#: mount/mount.c:973
#, c-format
msgid "mount: probably you meant %s"
msgstr "mount: ¤ª¤½¤é¤¯¤¢¤Ê¤¿¤Ï %s ¤ò»ØÄꤷ¤¿¤«¤Ã¤¿¤Î¤Ç¤·¤ç¤¦"
-#: mount/mount.c:973
+#: mount/mount.c:975
msgid "mount: maybe you meant iso9660 ?"
msgstr "mount: ¿ʬ¤¢¤Ê¤¿¤Ï iso9660 ¤ò»ØÄꤷ¤¿¤«¤Ã¤¿¤Î¤Ç¤Ï¡©"
-#: mount/mount.c:976
+#: mount/mount.c:978
#, c-format
msgid "mount: %s has wrong device number or fs type %s not supported"
msgstr ""
@@ -7593,12 +7792,12 @@ msgstr ""
" %s ¤¬¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
#. strange ...
-#: mount/mount.c:982
+#: mount/mount.c:984
#, c-format
msgid "mount: %s is not a block device, and stat fails?"
msgstr "mount: %s ¤Ï¥Ö¥í¥Ã¥¯¥Ç¥Ð¥¤¥¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡¢¤À¤«¤é stat ¤¬¼ºÇÔ¡©"
-#: mount/mount.c:984
+#: mount/mount.c:986
#, c-format
msgid ""
"mount: the kernel does not recognize %s as a block device\n"
@@ -7607,93 +7806,98 @@ msgstr ""
"mount: ¤³¤Î¥«¡¼¥Í¥ë¤Ï %s ¤ò¥Ö¥í¥Ã¥¯¥Ç¥Ð¥¤¥¹¤È¤·¤Æǧ¼±¤·¤Þ¤»¤ó\n"
" (¿ʬ¡¢`insmod ¥É¥é¥¤¥Ð' ¤·¤Ê¤¤¤È¤¤¤±¤Ê¤¤¤Î¤Ç¤Ï¡©)"
-#: mount/mount.c:987
+#: mount/mount.c:989
#, c-format
msgid "mount: %s is not a block device (maybe try `-o loop'?)"
msgstr ""
"mount: %s ¤Ï¥Ö¥í¥Ã¥¯¥Ç¥Ð¥¤¥¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó (¿ʬ `-o loop' ¤È¤ä¤Ã¤Æ¤ß¤¿¤é¡©)"
-#: mount/mount.c:990
+#: mount/mount.c:992
#, c-format
msgid "mount: %s is not a block device"
msgstr "mount: %s ¤Ï¥Ö¥í¥Ã¥¯¥Ç¥Ð¥¤¥¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
-#: mount/mount.c:993
+#: mount/mount.c:995
#, c-format
msgid "mount: %s is not a valid block device"
msgstr "mount: %s ¤ÏÀµ¾ï¤Ê¥Ö¥í¥Ã¥¯¥Ç¥Ð¥¤¥¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
#. pre-linux 1.1.38, 1.1.41 and later
#. linux 1.1.38 and later
-#: mount/mount.c:996
+#: mount/mount.c:998
msgid "block device "
msgstr "¥Ö¥í¥Ã¥¯¥Ç¥Ð¥¤¥¹ "
-#: mount/mount.c:998
+#: mount/mount.c:1000
#, c-format
msgid "mount: cannot mount %s%s read-only"
msgstr "mount: %s%s ¤òÆɹþ¤ßÀìÍѤǥޥ¦¥ó¥È¤Ç¤­¤Þ¤»¤ó"
-#: mount/mount.c:1002
+#: mount/mount.c:1004
#, c-format
msgid "mount: %s%s is write-protected but explicit `-w' flag given"
msgstr "mount: %s%s ¤Ï½ñ¤­¹þ¤ß¶Ø»ß¤Ç¤¹¤¬¡¢`-w' ¥Õ¥é¥°¤¬ÌÀ¼¨Åª¤ËÍ¿¤¨¤é¤ì¤Þ¤·¤¿"
-#: mount/mount.c:1018
+#: mount/mount.c:1020
#, c-format
msgid "mount: %s%s is write-protected, mounting read-only"
msgstr "mount: %s%s ¤Ï½ñ¤­¹þ¤ß¶Ø»ß¤Ç¤¹¡¢Æɹþ¤ßÀìÍѤǥޥ¦¥ó¥È¤·¤Þ¤¹"
-#: mount/mount.c:1104
+#: mount/mount.c:1107
#, c-format
msgid "mount: the label %s occurs on both %s and %s\n"
msgstr ""
-#: mount/mount.c:1108
+#: mount/mount.c:1111
#, fuzzy, c-format
msgid "mount: %s duplicate - not mounted"
msgstr "umount: %s: ¥Þ¥¦¥ó¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-#: mount/mount.c:1118
+#: mount/mount.c:1121
#, c-format
msgid "mount: going to mount %s by %s\n"
msgstr "mount: %s ¤ò %s ¤Ç¥Þ¥¦¥ó¥È¤·¤Þ¤¹\n"
-#: mount/mount.c:1119
+#: mount/mount.c:1122
msgid "UUID"
msgstr "UUID"
-#: mount/mount.c:1119
+#: mount/mount.c:1122
msgid "label"
msgstr "¥é¥Ù¥ë"
-#: mount/mount.c:1121 mount/mount.c:1521
+#: mount/mount.c:1124 mount/mount.c:1555
msgid "mount: no such partition found"
msgstr "mount: ¤½¤Î¤è¤¦¤Ê¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó"
-#: mount/mount.c:1129
+#: mount/mount.c:1132
msgid "mount: no type was given - I'll assume nfs because of the colon\n"
msgstr "mount: ¥¿¥¤¥×¤¬Í¿¤¨¤é¤ì¤Æ¤¤¤Þ¤»¤ó -- ¥³¥í¥ó¤¬¤¢¤ë¤Î¤Ç nfs ¤ÎÍͤǤ¹¤¬\n"
+#: mount/mount.c:1137
+#, fuzzy
+msgid "mount: no type was given - I'll assume smb because of the // prefix\n"
+msgstr "mount: ¥¿¥¤¥×¤¬Í¿¤¨¤é¤ì¤Æ¤¤¤Þ¤»¤ó -- ¥³¥í¥ó¤¬¤¢¤ë¤Î¤Ç nfs ¤ÎÍͤǤ¹¤¬\n"
+
#.
#. * Retry in the background.
#.
-#: mount/mount.c:1145
+#: mount/mount.c:1153
#, c-format
msgid "mount: backgrounding \"%s\"\n"
msgstr "mount: ¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É \"%s\"\n"
-#: mount/mount.c:1156
+#: mount/mount.c:1164
#, c-format
msgid "mount: giving up \"%s\"\n"
msgstr "mount: Äü¤á¤Þ¤·¤¿ \"%s\"\n"
-#: mount/mount.c:1216
+#: mount/mount.c:1240
#, c-format
msgid "mount: %s already mounted on %s\n"
msgstr "mount: %s ¤Ï %s ¤Ë¥Þ¥¦¥ó¥ÈºÑ¤Ç¤¹\n"
-#: mount/mount.c:1335
+#: mount/mount.c:1369
#, fuzzy
msgid ""
"Usage: mount -V : print version\n"
@@ -7738,74 +7942,74 @@ msgstr ""
"¤½¤Î¾¤Î¥ª¥×¥·¥ç¥ó: [-nfFrsvw] [-o ¥ª¥×¥·¥ç¥ó]\n"
"¤â¤Ã¤È¾Ü¤·¤¤¤³¤È¤òÃΤꤿ¤±¤ì¤Ð¡¢man 8 mount ¤È¾§¤¨¤Æ¤ß¤Þ¤·¤ç¤¦¡£\n"
-#: mount/mount.c:1497
+#: mount/mount.c:1531
msgid "mount: only root can do that"
msgstr "mount: root ¤À¤±¤¬¤½¤ì¤ò¹Ô¤Ê¤¨¤Þ¤¹"
-#: mount/mount.c:1502
+#: mount/mount.c:1536
#, c-format
msgid "mount: no %s found - creating it..\n"
msgstr "mount: %s ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó -- ºîÀ®¤·¤Þ¤¹..\n"
-#: mount/mount.c:1516
+#: mount/mount.c:1550
#, c-format
msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
msgstr ""
-#: mount/mount.c:1523
+#: mount/mount.c:1557
#, c-format
msgid "mount: mounting %s\n"
msgstr "mount: %s ¤ò¥Þ¥¦¥ó¥È¤·¤Þ¤¹\n"
-#: mount/mount.c:1532
+#: mount/mount.c:1566
msgid "nothing was mounted"
msgstr "²¿¤â¥Þ¥¦¥ó¥È¤µ¤ì¤Þ¤»¤ó¤Ç¤·¤¿"
-#: mount/mount.c:1547
+#: mount/mount.c:1581
#, c-format
msgid "mount: cannot find %s in %s"
msgstr "mount: %2$s Æâ¤Ë %1$s ¤ò¸«¤Ä¤±¤é¤ì¤Þ¤»¤ó"
-#: mount/mount.c:1562
+#: mount/mount.c:1596
#, c-format
msgid "mount: can't find %s in %s or %s"
msgstr "mount: %2$s ¤ä %3$s Æâ¤Ë %1$s ¤ò¸«¤Ä¤±¤é¤ì¤Þ¤»¤ó"
-#: mount/mount_by_label.c:169
+#: mount/mount_by_label.c:199
#, c-format
msgid ""
"mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
msgstr ""
"mount: %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ê¤«¤Ã¤¿¤Î¤Ç¡¢UUID ¤È LABEL ¤ÎÊÑ´¹¤â¹Ô¤¨¤Þ¤»¤ó¡£\n"
-#: mount/mount_by_label.c:295
+#: mount/mount_by_label.c:325
msgid "mount: bad UUID"
msgstr "mount: ÉÔÀµ¤Ê UUID"
-#: mount/mount_guess_fstype.c:487
+#: mount/mount_guess_fstype.c:482
msgid "mount: error while guessing filesystem type\n"
msgstr "mount: ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à·¿¿äÄêÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸\n"
-#: mount/mount_guess_fstype.c:496
+#: mount/mount_guess_fstype.c:491
#, c-format
msgid "mount: you didn't specify a filesystem type for %s\n"
msgstr "mount: %s ¤Ø¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥¿¥¤¥×¤Î»ØÄ꤬¤¢¤ê¤Þ¤»¤ó\n"
-#: mount/mount_guess_fstype.c:499
+#: mount/mount_guess_fstype.c:494
#, c-format
msgid " I will try all types mentioned in %s or %s\n"
msgstr " %s Ëô¤Ï %s ¤Î¥¿¥¤¥×¤ò»î¤·¤Æ¤ß¤Þ¤¹\n"
-#: mount/mount_guess_fstype.c:502
+#: mount/mount_guess_fstype.c:497
msgid " and it looks like this is swapspace\n"
msgstr " ¤½¤·¤Æ¡¢¤½¤ì¤Ï¥¹¥ï¥Ã¥×¶õ´Ö¤ÎÍͤǤ¹¡£\n"
-#: mount/mount_guess_fstype.c:504
+#: mount/mount_guess_fstype.c:499
#, c-format
msgid " I will try type %s\n"
msgstr " ¥¿¥¤¥× %s ¤ò»î¤·¤Æ¤ß¤Þ¤¹\n"
-#: mount/mount_guess_fstype.c:592
+#: mount/mount_guess_fstype.c:587
#, c-format
msgid "Trying %s\n"
msgstr "%s ¤ò»î¤·¤Þ¤¹\n"
@@ -7900,7 +8104,7 @@ msgstr "ÉÔÌÀ¤Ê nfs ¥¹¥Æ¡¼¥¿¥¹ÃͤòÊÖ¤·¤Þ¤·¤¿: %d"
msgid "bug in xstrndup call"
msgstr "xstrndup ¸Æ¤Ó½Ð¤·¤Î¥Ð¥°"
-#: mount/swapon.c:51
+#: mount/swapon.c:56
#, c-format
msgid ""
"usage: %s [-hV]\n"
@@ -7913,28 +8117,45 @@ msgstr ""
" %s [-v] [-p Í¥ÀèÅÙ] ¥¹¥Ú¥·¥ã¥ë¥Õ¥¡¥¤¥ë ...\n"
" %s [-s]\n"
-#: mount/swapon.c:88
+#: mount/swapon.c:66
+#, fuzzy, c-format
+msgid ""
+"usage: %s [-hV]\n"
+" %s -a [-v]\n"
+" %s [-v] special ...\n"
+msgstr ""
+"»È¤¤Êý: %s [-hV]\n"
+" %s -a [-v]\n"
+" %s [-v] [-p Í¥ÀèÅÙ] ¥¹¥Ú¥·¥ã¥ë¥Õ¥¡¥¤¥ë ...\n"
+" %s [-s]\n"
+
+#: mount/swapon.c:170 mount/swapon.c:234
#, c-format
msgid "%s on %s\n"
msgstr "%2$s ¤Ë %1$s\n"
-#: mount/swapon.c:93
+#: mount/swapon.c:174
#, c-format
msgid "swapon: cannot stat %s: %s\n"
msgstr "swapon: %s ¤Î¾õÂÖ¼èÆÀ¤¬¤Ç¤­¤Þ¤»¤ó: %s\n"
-#: mount/swapon.c:105
+#: mount/swapon.c:185
#, c-format
msgid "swapon: warning: %s has insecure permissions %04o, %04o suggested\n"
msgstr ""
"swapon: ·Ù¹ð: %s ¤Ï°ÂÁ´¤Ç¤Ê¤¤¸¢¸Â %04o ¤ò»ý¤Á¤Þ¤¹¡£ %04o ¤¬¤ª´«¤á¤Ç¤¹\n"
-#: mount/swapon.c:115
+#: mount/swapon.c:197
#, c-format
msgid "swapon: Skipping file %s - it appears to have holes.\n"
msgstr "swapon: ¥Õ¥¡¥¤¥ë %s ¤ò¥¹¥­¥Ã¥× -- ¥Û¡¼¥ë¤ò¸¡½Ð¡£\n"
-#: mount/swapon.c:222
+#: mount/swapon.c:240
+#, fuzzy
+msgid "Not superuser.\n"
+msgstr "¥»¥Ã¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
+
+#: mount/swapon.c:298 mount/swapon.c:386
#, c-format
msgid "%s: cannot open %s: %s\n"
msgstr "%s: %s ¤ò³«¤±¤Þ¤»¤ó: %s\n"
@@ -8306,29 +8527,29 @@ msgstr "%2$s ¤Ë %1$s\n"
msgid "%s: unknown argument: %s\n"
msgstr "%s: ÉÔÌÀ¤Ê¥·¥°¥Ê¥ë %s\n"
-#: sys-utils/ipcs.c:122
+#: sys-utils/ipcs.c:121
#, c-format
msgid "usage : %s -asmq -tclup \n"
msgstr "»È¤¤Êý : %s -asmq -tclup \n"
-#: sys-utils/ipcs.c:123
+#: sys-utils/ipcs.c:122
#, c-format
msgid "\t%s [-s -m -q] -i id\n"
msgstr "\t%s [-s -m -q] -i id\n"
-#: sys-utils/ipcs.c:124
+#: sys-utils/ipcs.c:123
#, c-format
msgid "\t%s -h for help.\n"
msgstr "\t%s -h ¤Ç¥Ø¥ë¥×¤òɽ¼¨¡£\n"
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:129
#, c-format
msgid ""
"%s provides information on ipc facilities for which you have read access.\n"
msgstr ""
"%s ¤Ï¤¢¤Ê¤¿¤¬Æɹþ¥¢¥¯¥»¥¹¤Ç¤­¤ë ipc ¤Î»ñ¸»¾õ¶·¤Ê¤É¤Î¾ðÊó¤òÄ󶡤·¤Þ¤¹¡£\n"
-#: sys-utils/ipcs.c:132
+#: sys-utils/ipcs.c:131
msgid ""
"Resource Specification:\n"
"\t-m : shared_mem\n"
@@ -8338,7 +8559,7 @@ msgstr ""
"\t-m : ¶¦Í­¥á¥â¥ê\n"
"\t-q : ¥á¥Ã¥»¡¼¥¸\n"
-#: sys-utils/ipcs.c:133
+#: sys-utils/ipcs.c:132
msgid ""
"\t-s : semaphores\n"
"\t-a : all (default)\n"
@@ -8346,7 +8567,7 @@ msgstr ""
"\t-s : ¥»¥Þ¥Õ¥©\n"
"\t-a : Á´¤Æ (½é´üÃÍ)\n"
-#: sys-utils/ipcs.c:134
+#: sys-utils/ipcs.c:133
msgid ""
"Output Format:\n"
"\t-t : time\n"
@@ -8358,7 +8579,7 @@ msgstr ""
"\t-p : ¥×¥í¥»¥¹ID\n"
"\t-c : ºîÀ®¼Ô\n"
-#: sys-utils/ipcs.c:135
+#: sys-utils/ipcs.c:134
msgid ""
"\t-l : limits\n"
"\t-u : summary\n"
@@ -8366,376 +8587,376 @@ msgstr ""
"\t-l : À©¸Â\n"
"\t-u : Í×Ìó\n"
-#: sys-utils/ipcs.c:136
+#: sys-utils/ipcs.c:135
msgid "-i id [-s -q -m] : details on resource identified by id\n"
msgstr "-i id [-s -q -m] : id ¤Ë¤è¤Ã¤Æ¼±Ê̤µ¤ì¤ë¥ê¥½¡¼¥¹¤Î¾ÜºÙ\n"
-#: sys-utils/ipcs.c:268
+#: sys-utils/ipcs.c:267
msgid "kernel not configured for shared memory\n"
msgstr "¥«¡¼¥Í¥ë¤Ç¤Î¶¦Í­¥á¥â¥ê¤Î°Ù¤ÎÀßÄ꤬¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
-#: sys-utils/ipcs.c:274
+#: sys-utils/ipcs.c:273
msgid "------ Shared Memory Limits --------\n"
msgstr "------ ¥·¥§¥¢¡¼¥É¥á¥â¥ê¤ÎÀ©¸Â --------\n"
#. glibc 2.1.3 and all earlier libc's have ints as fields
#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
-#: sys-utils/ipcs.c:279
+#: sys-utils/ipcs.c:278
#, c-format
msgid "max number of segments = %ld\n"
msgstr "¥»¥°¥á¥ó¥È¿ô¤ÎºÇÂçÃÍ = %ld\n"
-#: sys-utils/ipcs.c:281
+#: sys-utils/ipcs.c:280
#, c-format
msgid "max seg size (kbytes) = %ld\n"
msgstr "¥»¥°¥á¥ó¥È¥µ¥¤¥º¤ÎºÇÂç (ñ°Ì:KB) = %ld\n"
-#: sys-utils/ipcs.c:283
+#: sys-utils/ipcs.c:282
#, c-format
msgid "max total shared memory (kbytes) = %ld\n"
msgstr "¹ç·×¶¦Í­¥á¥â¥ê¤ÎºÇÂç (ñ°Ì:KB) = %ld\n"
-#: sys-utils/ipcs.c:285
+#: sys-utils/ipcs.c:284
#, c-format
msgid "min seg size (bytes) = %ld\n"
msgstr "ºÇ¾®¥»¥°¥á¥ó¥È¥µ¥¤¥º (ñ°Ì:KB) = %ld\n"
-#: sys-utils/ipcs.c:290
+#: sys-utils/ipcs.c:289
msgid "------ Shared Memory Status --------\n"
msgstr "------ ¥·¥§¥¢¡¼¥É¥á¥â¥ê¤Î¾õÂÖ --------\n"
-#: sys-utils/ipcs.c:291
+#: sys-utils/ipcs.c:290
#, c-format
msgid "segments allocated %d\n"
msgstr "³ÎÊݤµ¤ì¤¿¥»¥°¥á¥ó¥È %d\n"
-#: sys-utils/ipcs.c:292
+#: sys-utils/ipcs.c:291
#, c-format
msgid "pages allocated %ld\n"
msgstr "³ÎÊݤµ¤ì¤¿¥Ú¡¼¥¸ %ld\n"
-#: sys-utils/ipcs.c:293
+#: sys-utils/ipcs.c:292
#, c-format
msgid "pages resident %ld\n"
msgstr "¸ÇÄꤵ¤ì¤¿¥Ú¡¼¥¸ %ld\n"
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:293
#, c-format
msgid "pages swapped %ld\n"
msgstr "¥¹¥ï¥Ã¥×¤µ¤ì¤¿¥Ú¡¼¥¸ %ld\n"
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:294
#, c-format
msgid "Swap performance: %ld attempts\t %ld successes\n"
msgstr "¥¹¥ï¥Ã¥×¤ÎÆ°ºî: %ld ²ó»î¤ß %ld ²óÀ®¸ù\n"
-#: sys-utils/ipcs.c:300
+#: sys-utils/ipcs.c:299
msgid "------ Shared Memory Segment Creators/Owners --------\n"
msgstr "------ ¶¦Í­¥á¥â¥ê¥»¥°¥á¥ó¥È ºîÀ®¼Ô/½êÍ­¼Ô --------\n"
-#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:300 sys-utils/ipcs.c:417 sys-utils/ipcs.c:516
#, c-format
msgid "%-10s %-10s %-10s %-10s %-10s %-10s\n"
msgstr "%-10s %-10s %-10s %-10s %-10s %-10s\n"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:308 sys-utils/ipcs.c:315
-#: sys-utils/ipcs.c:321 sys-utils/ipcs.c:425
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:307 sys-utils/ipcs.c:314
+#: sys-utils/ipcs.c:320 sys-utils/ipcs.c:424
msgid "shmid"
msgstr "shmid"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:321 sys-utils/ipcs.c:419
-#: sys-utils/ipcs.c:434 sys-utils/ipcs.c:519 sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:320 sys-utils/ipcs.c:418
+#: sys-utils/ipcs.c:433 sys-utils/ipcs.c:517 sys-utils/ipcs.c:535
msgid "perms"
msgstr "¸¢¸Â"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:517
msgid "cuid"
msgstr "cuid"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:517
msgid "cgid"
msgstr "cgid"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:517
msgid "uid"
msgstr "uid"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:517
msgid "gid"
msgstr "gid"
-#: sys-utils/ipcs.c:306
+#: sys-utils/ipcs.c:305
msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
msgstr "------ ¥·¥§¥¢¡¼¥É¥á¥â¥ê ·ë¹ç/ʬΥ/Êѹ¹²ó¿ô --------\n"
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:306
#, c-format
msgid "%-10s %-10s %-20s %-20s %-20s\n"
msgstr "%-10s %-10s %-20s %-20s %-20s\n"
-#: sys-utils/ipcs.c:308 sys-utils/ipcs.c:315 sys-utils/ipcs.c:321
-#: sys-utils/ipcs.c:425 sys-utils/ipcs.c:434 sys-utils/ipcs.c:525
-#: sys-utils/ipcs.c:531 sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:314 sys-utils/ipcs.c:320
+#: sys-utils/ipcs.c:424 sys-utils/ipcs.c:433 sys-utils/ipcs.c:523
+#: sys-utils/ipcs.c:529 sys-utils/ipcs.c:535
msgid "owner"
msgstr "½êÍ­¼Ô"
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:307
msgid "attached"
msgstr "·ë¹ç"
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:307
msgid "detached"
msgstr "ʬΥ"
-#: sys-utils/ipcs.c:309
+#: sys-utils/ipcs.c:308
msgid "changed"
msgstr "Êѹ¹"
-#: sys-utils/ipcs.c:313
+#: sys-utils/ipcs.c:312
msgid "------ Shared Memory Creator/Last-op --------\n"
msgstr "------ ¶¦Í­¥á¥â¥ê ºîÀ®¼Ô/ľ¶á¤ÎÌ¿Îá --------\n"
-#: sys-utils/ipcs.c:314 sys-utils/ipcs.c:530
+#: sys-utils/ipcs.c:313 sys-utils/ipcs.c:528
#, c-format
msgid "%-10s %-10s %-10s %-10s\n"
msgstr "%-10s %-10s %-10s %-10s\n"
-#: sys-utils/ipcs.c:315
+#: sys-utils/ipcs.c:314
msgid "cpid"
msgstr "cpid"
-#: sys-utils/ipcs.c:315
+#: sys-utils/ipcs.c:314
msgid "lpid"
msgstr "lpid"
-#: sys-utils/ipcs.c:319
+#: sys-utils/ipcs.c:318
msgid "------ Shared Memory Segments --------\n"
msgstr "------ ¶¦Í­¥á¥â¥ê¥»¥°¥á¥ó¥È --------\n"
-#: sys-utils/ipcs.c:320
+#: sys-utils/ipcs.c:319
#, c-format
msgid "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n"
msgstr "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n"
-#: sys-utils/ipcs.c:321 sys-utils/ipcs.c:434 sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:320 sys-utils/ipcs.c:433 sys-utils/ipcs.c:535
msgid "key"
msgstr "¥­¡¼"
-#: sys-utils/ipcs.c:321
+#: sys-utils/ipcs.c:320
msgid "bytes"
msgstr "¥Ð¥¤¥È"
-#: sys-utils/ipcs.c:322
+#: sys-utils/ipcs.c:321
msgid "nattch"
msgstr "nattch"
-#: sys-utils/ipcs.c:322 sys-utils/ipcs.c:435
+#: sys-utils/ipcs.c:321
msgid "status"
msgstr "¾õÂÖ"
-#: sys-utils/ipcs.c:343 sys-utils/ipcs.c:345 sys-utils/ipcs.c:347
-#: sys-utils/ipcs.c:456 sys-utils/ipcs.c:458 sys-utils/ipcs.c:558
-#: sys-utils/ipcs.c:560 sys-utils/ipcs.c:562 sys-utils/ipcs.c:615
-#: sys-utils/ipcs.c:617 sys-utils/ipcs.c:646 sys-utils/ipcs.c:648
-#: sys-utils/ipcs.c:650 sys-utils/ipcs.c:674
+#: sys-utils/ipcs.c:342 sys-utils/ipcs.c:344 sys-utils/ipcs.c:346
+#: sys-utils/ipcs.c:455 sys-utils/ipcs.c:457 sys-utils/ipcs.c:556
+#: sys-utils/ipcs.c:558 sys-utils/ipcs.c:560 sys-utils/ipcs.c:613
+#: sys-utils/ipcs.c:615 sys-utils/ipcs.c:644 sys-utils/ipcs.c:646
+#: sys-utils/ipcs.c:648 sys-utils/ipcs.c:672
msgid "Not set"
msgstr "¥»¥Ã¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-#: sys-utils/ipcs.c:372
+#: sys-utils/ipcs.c:371
msgid "dest"
msgstr "ÂоÝ"
-#: sys-utils/ipcs.c:373
+#: sys-utils/ipcs.c:372
msgid "locked"
msgstr "¥í¥Ã¥¯"
-#: sys-utils/ipcs.c:393
+#: sys-utils/ipcs.c:392
msgid "kernel not configured for semaphores\n"
msgstr "¥«¡¼¥Í¥ë¤Ç¤Î¥»¥Þ¥Õ¥©¤Î°Ù¤ÎÀßÄ꤬¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
-#: sys-utils/ipcs.c:399
+#: sys-utils/ipcs.c:398
msgid "------ Semaphore Limits --------\n"
msgstr "------ ¥»¥Þ¥Õ¥©¤ÎÀ©¸Â --------\n"
-#: sys-utils/ipcs.c:403
+#: sys-utils/ipcs.c:402
#, c-format
msgid "max number of arrays = %d\n"
msgstr "ºÇÂçÇÛÎó¿ô = %d\n"
-#: sys-utils/ipcs.c:404
+#: sys-utils/ipcs.c:403
#, c-format
msgid "max semaphores per array = %d\n"
msgstr "ÇÛÎóËè¤ÎºÇÂ祻¥Þ¥Õ¥©¿ô = %d\n"
-#: sys-utils/ipcs.c:405
+#: sys-utils/ipcs.c:404
#, c-format
msgid "max semaphores system wide = %d\n"
msgstr "¥·¥¹¥Æ¥àÁ´ÂΤκÇÂ祻¥Þ¥Õ¥©¿ô = %d\n"
-#: sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:405
#, c-format
msgid "max ops per semop call = %d\n"
msgstr "semop ¸Æ¤Ó½Ð¤·Ëè¤ÎºÇÂçÌ¿Îá¿ô = %d\n"
-#: sys-utils/ipcs.c:407
+#: sys-utils/ipcs.c:406
#, c-format
msgid "semaphore max value = %d\n"
msgstr "¥»¥Þ¥Õ¥©ºÇÂçÃÍ = %d\n"
-#: sys-utils/ipcs.c:411
+#: sys-utils/ipcs.c:410
msgid "------ Semaphore Status --------\n"
msgstr "------ ¥»¥Þ¥Õ¥©¤Î¾õÂÖ --------\n"
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:411
#, c-format
msgid "used arrays = %d\n"
msgstr "»ÈÍÑÇÛÎó¿ô = %d\n"
-#: sys-utils/ipcs.c:413
+#: sys-utils/ipcs.c:412
#, c-format
msgid "allocated semaphores = %d\n"
msgstr "³ÎÊݤµ¤ì¤¿¥»¥Þ¥Õ¥©¿ô = %d\n"
-#: sys-utils/ipcs.c:417
+#: sys-utils/ipcs.c:416
msgid "------ Semaphore Arrays Creators/Owners --------\n"
msgstr "------ ¥»¥Þ¥Õ¥©ÇÛÎó ºîÀ®¼Ô/½êÍ­¼Ô --------\n"
-#: sys-utils/ipcs.c:419 sys-utils/ipcs.c:434
+#: sys-utils/ipcs.c:418 sys-utils/ipcs.c:433
msgid "semid"
msgstr "semid"
-#: sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:422
msgid "------ Shared Memory Operation/Change Times --------\n"
msgstr "------ ¥·¥§¥¢¡¼¥É¥á¥â¥ê Ì¿Îá/Êѹ¹²ó¿ô --------\n"
-#: sys-utils/ipcs.c:424
+#: sys-utils/ipcs.c:423
#, c-format
msgid "%-8s %-10s %-26.24s %-26.24s\n"
msgstr "%-8s %-10s %-26.24s %-26.24s\n"
-#: sys-utils/ipcs.c:425
+#: sys-utils/ipcs.c:424
msgid "last-op"
msgstr "ºÇ½ªÁàºî"
-#: sys-utils/ipcs.c:425
+#: sys-utils/ipcs.c:424
msgid "last-changed"
msgstr "ºÇ½ª¤ÎÊѹ¹"
-#: sys-utils/ipcs.c:432
+#: sys-utils/ipcs.c:431
msgid "------ Semaphore Arrays --------\n"
msgstr "------ ¥»¥Þ¥Õ¥©ÇÛÎó --------\n"
-#: sys-utils/ipcs.c:433
+#: sys-utils/ipcs.c:432 sys-utils/ipcs.c:675
#, c-format
-msgid "%-10s %-10s %-10s %-10s %-10s %-12s\n"
-msgstr "%-10s %-10s %-10s %-10s %-10s %-12s\n"
+msgid "%-10s %-10s %-10s %-10s %-10s\n"
+msgstr "%-10s %-10s %-10s %-10s %-10s\n"
-#: sys-utils/ipcs.c:435
+#: sys-utils/ipcs.c:434
msgid "nsems"
msgstr "nsems"
-#: sys-utils/ipcs.c:495
+#: sys-utils/ipcs.c:493
msgid "kernel not configured for message queues\n"
msgstr "¥«¡¼¥Í¥ë¤Ç¤Î¥á¥Ã¥»¡¼¥¸¥­¥å¡¼¤Î°Ù¤ÎÀßÄ꤬¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
-#: sys-utils/ipcs.c:503
+#: sys-utils/ipcs.c:501
msgid "------ Messages: Limits --------\n"
msgstr "------ ¥á¥Ã¥»¡¼¥¸: À©¸Â --------\n"
-#: sys-utils/ipcs.c:504
+#: sys-utils/ipcs.c:502
#, c-format
msgid "max queues system wide = %d\n"
msgstr "¥·¥¹¥Æ¥àÁ´ÂΤǤκÇÂ祭¥å¡¼¿ô = %d\n"
-#: sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:503
#, c-format
msgid "max size of message (bytes) = %d\n"
msgstr "ºÇÂç¥á¥Ã¥»¡¼¥¸¥µ¥¤¥º (¥Ð¥¤¥È) = %d\n"
-#: sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:504
#, c-format
msgid "default max size of queue (bytes) = %d\n"
msgstr "¥­¥å¡¼¥µ¥¤¥ººÇÂçÃͤνé´üÃÍ (¥Ð¥¤¥È) = %d\n"
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:508
msgid "------ Messages: Status --------\n"
msgstr "------ ¥á¥Ã¥»¡¼¥¸: ¾õÂÖ --------\n"
-#: sys-utils/ipcs.c:511
+#: sys-utils/ipcs.c:509
#, c-format
msgid "allocated queues = %d\n"
msgstr "³ÎÊݺѤߥ­¥å¡¼¿ô = %d\n"
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:510
#, c-format
msgid "used headers = %d\n"
msgstr "»ÈÍѺѥإåÀ = %d\n"
-#: sys-utils/ipcs.c:513
+#: sys-utils/ipcs.c:511
#, c-format
msgid "used space = %d bytes\n"
msgstr "»ÈÍѺѶõ´Ö = %d ¥Ð¥¤¥È\n"
-#: sys-utils/ipcs.c:517
+#: sys-utils/ipcs.c:515
msgid "------ Message Queues: Creators/Owners --------\n"
msgstr "------ ¥á¥Ã¥»¡¼¥¸¥­¥å¡¼: ºîÀ®¼Ô/½êÍ­¼Ô --------\n"
-#: sys-utils/ipcs.c:519 sys-utils/ipcs.c:525 sys-utils/ipcs.c:531
-#: sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:517 sys-utils/ipcs.c:523 sys-utils/ipcs.c:529
+#: sys-utils/ipcs.c:535
msgid "msqid"
msgstr "msqid"
-#: sys-utils/ipcs.c:523
+#: sys-utils/ipcs.c:521
msgid "------ Message Queues Send/Recv/Change Times --------\n"
msgstr "------ ¥á¥Ã¥»¡¼¥¸¥­¥å¡¼ Á÷¿®/¼õ¿®/Êѹ¹²ó¿ô --------\n"
-#: sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:522
#, c-format
msgid "%-8s %-10s %-20s %-20s %-20s\n"
msgstr "%-8s %-10s %-20s %-20s %-20s\n"
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:523
msgid "send"
msgstr "Á÷¿®"
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:523
msgid "recv"
msgstr "¼õ¿®"
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:523
msgid "change"
msgstr "Êѹ¹"
-#: sys-utils/ipcs.c:529
+#: sys-utils/ipcs.c:527
msgid "------ Message Queues PIDs --------\n"
msgstr "------ ¥á¥Ã¥»¡¼¥¸¥­¥å¡¼ PIDs --------\n"
-#: sys-utils/ipcs.c:531
+#: sys-utils/ipcs.c:529
msgid "lspid"
msgstr "lspid"
-#: sys-utils/ipcs.c:531
+#: sys-utils/ipcs.c:529
msgid "lrpid"
msgstr "lrpid"
-#: sys-utils/ipcs.c:535
+#: sys-utils/ipcs.c:533
msgid "------ Message Queues --------\n"
msgstr "------ ¥á¥Ã¥»¡¼¥¸¥­¥å¡¼ --------\n"
-#: sys-utils/ipcs.c:536
+#: sys-utils/ipcs.c:534
#, c-format
msgid "%-10s %-10s %-10s %-10s %-12s %-12s\n"
msgstr "%-10s %-10s %-10s %-10s %-12s %-12s\n"
-#: sys-utils/ipcs.c:538
+#: sys-utils/ipcs.c:536
msgid "used-bytes"
msgstr "»ÈÍѥХ¤¥È¿ô"
-#: sys-utils/ipcs.c:538
+#: sys-utils/ipcs.c:536
msgid "messages"
msgstr "¥á¥Ã¥»¡¼¥¸"
-#: sys-utils/ipcs.c:606
+#: sys-utils/ipcs.c:604
#, c-format
msgid ""
"\n"
@@ -8744,37 +8965,37 @@ msgstr ""
"\n"
"¥·¥§¥¢¡¼¥É¥á¥â¥ê¥»¥°¥á¥ó¥È shmid=%d\n"
-#: sys-utils/ipcs.c:607
+#: sys-utils/ipcs.c:605
#, c-format
msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
-#: sys-utils/ipcs.c:609
+#: sys-utils/ipcs.c:607
#, c-format
msgid "mode=%#o\taccess_perms=%#o\n"
msgstr "¥â¡¼¥É=%#o\t¥¢¥¯¥»¥¹¸¢=%#o\n"
-#: sys-utils/ipcs.c:611
+#: sys-utils/ipcs.c:609
#, c-format
msgid "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n"
msgstr "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n"
-#: sys-utils/ipcs.c:614
+#: sys-utils/ipcs.c:612
#, c-format
msgid "att_time=%-26.24s\n"
msgstr "att_time=%-26.24s\n"
-#: sys-utils/ipcs.c:616
+#: sys-utils/ipcs.c:614
#, c-format
msgid "det_time=%-26.24s\n"
msgstr "det_time=%-26.24s\n"
-#: sys-utils/ipcs.c:618 sys-utils/ipcs.c:649
+#: sys-utils/ipcs.c:616 sys-utils/ipcs.c:647
#, c-format
msgid "change_time=%-26.24s\n"
msgstr "change_time=%-26.24s\n"
-#: sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:631
#, c-format
msgid ""
"\n"
@@ -8783,27 +9004,27 @@ msgstr ""
"\n"
"¥á¥Ã¥»¡¼¥¸¥­¥å¡¼ msqid=%d\n"
-#: sys-utils/ipcs.c:634
+#: sys-utils/ipcs.c:632
#, c-format
msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
-#: sys-utils/ipcs.c:636
+#: sys-utils/ipcs.c:634
#, c-format
msgid "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
msgstr "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
-#: sys-utils/ipcs.c:645
+#: sys-utils/ipcs.c:643
#, c-format
msgid "send_time=%-26.24s\n"
msgstr "send_time=%-26.24s\n"
-#: sys-utils/ipcs.c:647
+#: sys-utils/ipcs.c:645
#, c-format
msgid "rcv_time=%-26.24s\n"
msgstr "rcv_time=%-26.24s\n"
-#: sys-utils/ipcs.c:667
+#: sys-utils/ipcs.c:665
#, c-format
msgid ""
"\n"
@@ -8812,53 +9033,48 @@ msgstr ""
"\n"
"¥»¥Þ¥Õ¥©ÇÛÎó semid=%d\n"
-#: sys-utils/ipcs.c:668
+#: sys-utils/ipcs.c:666
#, c-format
msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
msgstr "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
-#: sys-utils/ipcs.c:670
+#: sys-utils/ipcs.c:668
#, c-format
msgid "mode=%#o, access_perms=%#o\n"
msgstr "¥â¡¼¥É=%#o, ¥¢¥¯¥»¥¹¸¢=%#o\n"
-#: sys-utils/ipcs.c:672
+#: sys-utils/ipcs.c:670
#, c-format
msgid "nsems = %ld\n"
msgstr "nsems = %ld\n"
-#: sys-utils/ipcs.c:673
+#: sys-utils/ipcs.c:671
#, c-format
msgid "otime = %-26.24s\n"
msgstr "otime = %-26.24s\n"
-#: sys-utils/ipcs.c:675
+#: sys-utils/ipcs.c:673
#, c-format
msgid "ctime = %-26.24s\n"
msgstr "ctime = %-26.24s\n"
-#: sys-utils/ipcs.c:677
-#, c-format
-msgid "%-10s %-10s %-10s %-10s %-10s\n"
-msgstr "%-10s %-10s %-10s %-10s %-10s\n"
-
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "semnum"
msgstr "semnum"
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "value"
msgstr "ÃÍ"
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "ncount"
msgstr "ncount"
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "zcount"
msgstr "zcount"
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "pid"
msgstr "pid"
@@ -9107,11 +9323,11 @@ msgstr "¹Ô¤Ï´û¤Ë½ñ¤­¹þ¤Þ¤ì¤¿¤Î¤Ç"
msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
msgstr "»È¤¤Êý: %s [ - ] [ -2 ] [ ¥Õ¥¡¥¤¥ë ... ]\n"
-#: text-utils/column.c:298
+#: text-utils/column.c:297
msgid "line too long"
msgstr "¹Ô¤¬Ä¹¤¹¤®¤Þ¤¹"
-#: text-utils/column.c:375
+#: text-utils/column.c:374
msgid "usage: column [-tx] [-c columns] [file ...]\n"
msgstr "»È¤¤Êý: column [-tx] [-c ¥«¥é¥à¿ô] [¥Õ¥¡¥¤¥ë ...]\n"
@@ -9203,33 +9419,33 @@ msgstr ""
msgid "Can't open help file"
msgstr "¥Ø¥ë¥×¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó"
-#: text-utils/more.c:1442 text-utils/more.c:1446
+#: text-utils/more.c:1442 text-utils/more.c:1447
msgid "[Press 'h' for instructions.]"
msgstr "['h' ¥­¡¼¤ÇÁàºîÊýË¡]"
-#: text-utils/more.c:1480
+#: text-utils/more.c:1481
#, c-format
msgid "\"%s\" line %d"
msgstr "\"%s\" %d ¹Ô"
-#: text-utils/more.c:1482
+#: text-utils/more.c:1483
#, c-format
msgid "[Not a file] line %d"
msgstr "[Èó¥Õ¥¡¥¤¥ë] %d ¹Ô"
-#: text-utils/more.c:1566
+#: text-utils/more.c:1567
msgid " Overflow\n"
msgstr " Â礭¤¹¤®\n"
-#: text-utils/more.c:1613
+#: text-utils/more.c:1614
msgid "...skipping\n"
msgstr "...Èô¤Ð¤·¤Æ¤¤¤Þ¤¹\n"
-#: text-utils/more.c:1643
+#: text-utils/more.c:1644
msgid "Regular expression botch"
msgstr "Àµµ¬É½¸½¤¬¥Þ¥º¤¤"
-#: text-utils/more.c:1655
+#: text-utils/more.c:1656
msgid ""
"\n"
"Pattern not found\n"
@@ -9237,15 +9453,15 @@ msgstr ""
"\n"
"¥Ñ¥¿¡¼¥ó¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
-#: text-utils/more.c:1658
+#: text-utils/more.c:1659 text-utils/pg.c:1134 text-utils/pg.c:1285
msgid "Pattern not found"
msgstr "¥Ñ¥¿¡¼¥ó¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
-#: text-utils/more.c:1719
+#: text-utils/more.c:1720
msgid "can't fork\n"
msgstr "»Ò¥×¥í¥»¥¹¤òµ¯Æ°¤Ç¤­¤Þ¤»¤ó\n"
-#: text-utils/more.c:1758
+#: text-utils/more.c:1759
msgid ""
"\n"
"...Skipping "
@@ -9253,19 +9469,19 @@ msgstr ""
"\n"
"...Èô¤Ð¤·¤Æ¤¤¤Þ¤¹ "
-#: text-utils/more.c:1763
+#: text-utils/more.c:1764
msgid "...Skipping to file "
msgstr "...¥Õ¥¡¥¤¥ë¤òÈô¤Ð¤·¤Þ¤¹ "
-#: text-utils/more.c:1765
+#: text-utils/more.c:1766
msgid "...Skipping back to file "
msgstr "...¥Õ¥¡¥¤¥ë¤ËÌá¤ê¤Þ¤¹ "
-#: text-utils/more.c:2046
+#: text-utils/more.c:2047
msgid "Line too long"
msgstr "¹Ô¤¬Ä¹¤¹¤®¤Þ¤¹"
-#: text-utils/more.c:2089
+#: text-utils/more.c:2090
msgid "No previous command to substitute for"
msgstr "ÂçÂΤΤ¿¤á¤Î°ÊÁ°¤Î¥³¥Þ¥ó¥É¤¬¤¢¤ê¤Þ¤»¤ó"
@@ -9316,6 +9532,102 @@ msgstr "hexdump: ÉÔÀµ¤Ê½ñ¼° {%s}\n"
msgid "hexdump: bad conversion character %%%s.\n"
msgstr "hexdump: ÉÔÀµ¤ÊÊÑ´¹¥­¥ã¥é¥¯¥¿ %%%s¡£\n"
+#: text-utils/pg.c:246
+#, c-format
+msgid ""
+"%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
+msgstr ""
+
+#: text-utils/pg.c:255
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- %s\n"
+msgstr "¥ª¥×¥·¥ç¥ó `%s' ¤Ï°ú¿ô¤òÍ׵ᤷ¤Þ¤¹\n"
+
+#: text-utils/pg.c:263
+#, fuzzy, c-format
+msgid "%s: illegal option -- %s\n"
+msgstr "ÉÔÀµ¤Ê¥­¡¼"
+
+#: text-utils/pg.c:380
+#, fuzzy
+msgid "...skipping forward\n"
+msgstr "...Èô¤Ð¤·¤Æ¤¤¤Þ¤¹\n"
+
+#: text-utils/pg.c:382
+#, fuzzy
+msgid "...skipping backward\n"
+msgstr "...Èô¤Ð¤·¤Æ¤¤¤Þ¤¹\n"
+
+#: text-utils/pg.c:404
+#, fuzzy
+msgid "No next file"
+msgstr "(¼¡¤Î¥Õ¥¡¥¤¥ë: %s)"
+
+#: text-utils/pg.c:408
+#, fuzzy
+msgid "No previous file"
+msgstr "Îΰ褬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
+
+#: text-utils/pg.c:938
+#, fuzzy, c-format
+msgid "%s: Read error from %s file\n"
+msgstr "%s: %s ¤Ç read ¥¨¥é¡¼\n"
+
+#.
+#. * Most likely '\0' in input.
+#.
+#: text-utils/pg.c:944
+#, c-format
+msgid "%s: Unexpected EOF in %s file\n"
+msgstr ""
+
+#: text-utils/pg.c:947
+#, fuzzy, c-format
+msgid "%s: Unknown error in %s file\n"
+msgstr "%s: %s ¤Ç seek ¥¨¥é¡¼\n"
+
+#: text-utils/pg.c:1042
+#, fuzzy, c-format
+msgid "%s: Cannot create tempfile\n"
+msgstr "%s: °ì»þ¥Õ¥¡¥¤¥ë¤òÆɤá¤Þ¤»¤ó¡£\n"
+
+#: text-utils/pg.c:1051 text-utils/pg.c:1226
+#, fuzzy
+msgid "RE error: "
+msgstr ", ¥¨¥é¡¼"
+
+#: text-utils/pg.c:1208
+msgid "(EOF)"
+msgstr ""
+
+#: text-utils/pg.c:1234
+msgid "No remembered search string"
+msgstr ""
+
+#: text-utils/pg.c:1317
+#, fuzzy
+msgid "Cannot open "
+msgstr "%s ¤ò³«¤±¤Þ¤»¤ó\n"
+
+#: text-utils/pg.c:1365
+#, fuzzy
+msgid "saved"
+msgstr "Á÷¿®"
+
+#: text-utils/pg.c:1472
+msgid ": !command not allowed in rflag mode.\n"
+msgstr ""
+
+#: text-utils/pg.c:1504
+#, fuzzy
+msgid "fork() failed, try again later\n"
+msgstr "¥Ñ¥¹¥ï¡¼¥É¤ÏÊѹ¹ *¤µ¤ì¤Þ¤»¤ó¤Ç¤·¤¿*¡£¸å¤Ç¤â¤¦°ìÅٻ¤Æ¤¯¤À¤µ¤¤¡£\n"
+
+#: text-utils/pg.c:1709
+#, fuzzy
+msgid "(Next file: "
+msgstr "(¼¡¤Î¥Õ¥¡¥¤¥ë: %s)"
+
#: text-utils/rev.c:113
msgid "Unable to allocate bufferspace\n"
msgstr "¥Ð¥Ã¥Õ¥¡¶õ´Ö¤ò³ÎÊݤǤ­¤Þ¤»¤ó\n"
@@ -9350,6 +9662,27 @@ msgstr "ÆþÎϹԤ¬Ä¹¤¹¤®¤Þ¤¹¡£\n"
msgid "Out of memory when growing buffer.\n"
msgstr "¥Ð¥Ã¥Õ¥¡¤ò³ÈÂ礹¤ë¤È¤­¤Ë¥á¥â¥ê¤¬Â­¤ê¤Ê¤¯¤Ê¤ê¤Þ¤·¤¿¡£\n"
+#~ msgid "invalid number `%s'\n"
+#~ msgstr "ÉÔÀµ¤ÊÃÍ `%s'\n"
+
+#~ msgid "number `%s' to `%s' out of range\n"
+#~ msgstr "ÃÍ `%s' ¤Ï `%s' ¤Ë¤È¤Ã¤ÆÈϰϳ°¤Ç¤¹\n"
+
+#~ msgid "unrecognized option `%s'\n"
+#~ msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥ª¥×¥·¥ç¥ó `%s' ¤Ç¤¹\n"
+
+#~ msgid "option `%s' requires an argument\n"
+#~ msgstr "¥ª¥×¥·¥ç¥ó `%s' ¤Ï°ú¿ô¤òÍ׵ᤷ¤Þ¤¹\n"
+
+#~ msgid "option `%s' doesn't allow an argument\n"
+#~ msgstr "¥ª¥×¥·¥ç¥ó `%s' ¤Ï°ú¿ô¤ò¼õ¤±ÉÕ¤±¤Þ¤»¤ó\n"
+
+#~ msgid "unrecognized option `-%c'\n"
+#~ msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥ª¥×¥·¥ç¥ó `-%c' ¤Ç¤¹\n"
+
+#~ msgid "%-10s %-10s %-10s %-10s %-10s %-12s\n"
+#~ msgstr "%-10s %-10s %-10s %-10s %-10s %-12s\n"
+
#~ msgid "umount: only %s can unmount %s from %s"
#~ msgstr "umount: %s ¤À¤±¤¬ %s ¤ò %s ¤«¤é¥¢¥ó¥Þ¥¦¥ó¥È¤Ç¤­¤Þ¤¹"
@@ -9542,9 +9875,6 @@ msgstr "¥Ð¥Ã¥Õ¥¡¤ò³ÈÂ礹¤ë¤È¤­¤Ë¥á¥â¥ê¤¬Â­¤ê¤Ê¤¯¤Ê¤ê¤Þ¤·¤¿¡£\n"
#~ msgid " which you have read access.\n"
#~ msgstr " \n"
-#~ msgid "Not set\n"
-#~ msgstr "¥»¥Ã¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
-
#~ msgid "send_time=%srcv_time=%schange_time=%s"
#~ msgstr "Á÷¿®²ó¿ô=%s¼õ¿®²ó¿ô=%sÊѹ¹²ó¿ô=%s"
diff --git a/po/nl.po b/po/nl.po
index a5fd80fb0..5018c2b95 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: util-linux 2.9n\n"
-"POT-Creation-Date: 2002-05-09 02:51+0200\n"
+"POT-Creation-Date: 2002-07-07 17:03+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"
@@ -31,9 +31,8 @@ msgid "get sectorsize"
msgstr "Sectoren"
#: disk-utils/blockdev.c:70
-#, fuzzy
msgid "get blocksize"
-msgstr "Sectoren"
+msgstr ""
#: disk-utils/blockdev.c:73
msgid "set blocksize"
@@ -111,28 +110,28 @@ msgstr ""
msgid "usage:\n"
msgstr ""
-#: disk-utils/fdformat.c:35
+#: disk-utils/fdformat.c:31
msgid "Formatting ... "
msgstr "Aan het formatteren ... "
-#: disk-utils/fdformat.c:53 disk-utils/fdformat.c:88
+#: disk-utils/fdformat.c:49 disk-utils/fdformat.c:84
msgid "done\n"
msgstr "klaar\n"
-#: disk-utils/fdformat.c:64
+#: disk-utils/fdformat.c:60
msgid "Verifying ... "
msgstr "Controle ... "
-#: disk-utils/fdformat.c:75
+#: disk-utils/fdformat.c:71
msgid "Read: "
msgstr "Lezen: "
-#: disk-utils/fdformat.c:77
+#: disk-utils/fdformat.c:73
#, c-format
msgid "Problem reading cylinder %d, expected %d, read %d\n"
msgstr "Probleem bij het lezen van cylinder %d, verwacht %d, gelezen %d\n"
-#: disk-utils/fdformat.c:83
+#: disk-utils/fdformat.c:79
#, c-format
msgid ""
"bad data in cyl %d\n"
@@ -141,42 +140,148 @@ msgstr ""
"rotte gegevens in cyl %d\n"
"Ik ga verder ... "
-#: disk-utils/fdformat.c:98
+#: disk-utils/fdformat.c:94
#, c-format
msgid "usage: %s [ -n ] device\n"
msgstr "aanroep: %s [ -n ] apparaat\n"
-#: disk-utils/fdformat.c:120 disk-utils/fsck.minix.c:1291
+#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1291
#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:55
-#: disk-utils/mkfs.minix.c:644 disk-utils/mkswap.c:457
-#: disk-utils/setfdprm.c:128 misc-utils/cal.c:246 misc-utils/ddate.c:181
-#: misc-utils/kill.c:188 misc-utils/rename.c:79 misc-utils/script.c:132
+#: disk-utils/mkfs.cramfs.c:665 disk-utils/mkfs.minix.c:644
+#: disk-utils/mkswap.c:457 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1170
+#: misc-utils/cal.c:246 misc-utils/ddate.c:181 misc-utils/kill.c:188
+#: misc-utils/rename.c:79 misc-utils/script.c:132
#, c-format
msgid "%s from %s\n"
msgstr ""
-#: disk-utils/fdformat.c:134
-#, c-format
-msgid "%s: not a floppy device\n"
+#: disk-utils/fdformat.c:130
+#, fuzzy, c-format
+msgid "%s: not a block device\n"
msgstr "%s: dit apparaat is geen floppy\n"
-#: disk-utils/fdformat.c:143
+#: disk-utils/fdformat.c:140
msgid "Could not determine current format type"
msgstr "Kon niet bepalen wat het huidige formaat is"
-#: disk-utils/fdformat.c:144
+#: disk-utils/fdformat.c:141
#, c-format
msgid "%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n"
msgstr "%szijdig, %d sporen, %d sectoren/spoor. Totale capaciteit %d kB.\n"
-#: disk-utils/fdformat.c:145
+#: disk-utils/fdformat.c:142
msgid "Double"
msgstr "Dubbel"
-#: disk-utils/fdformat.c:145
+#: disk-utils/fdformat.c:142
msgid "Single"
msgstr "Enkel"
+#: disk-utils/fsck.cramfs.c:98
+#, c-format
+msgid ""
+"usage: %s [-hv] [-x dir] file\n"
+" -h print this help\n"
+" -x dir extract into dir\n"
+" -v be more verbose\n"
+" file file to test\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:191
+#, c-format
+msgid "%s: error %d while decompressing! %p(%d)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:243
+#, fuzzy, c-format
+msgid "%s: size error in symlink `%s'\n"
+msgstr "Kan het bestand '%s' niet openen"
+
+#: disk-utils/fsck.cramfs.c:258 disk-utils/fsck.cramfs.c:328
+#, c-format
+msgid " uncompressing block at %ld to %ld (%ld)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:287
+#, c-format
+msgid "%s: bogus mode on `%s' (%o)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:319
+#, c-format
+msgid " hole at %ld (%d)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:337
+#, c-format
+msgid "%s: Non-block (%ld) bytes\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:343
+#, c-format
+msgid "%s: Non-size (%ld vs %ld) bytes\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:392
+#, c-format
+msgid "%s: invalid cramfs--bad path length\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:472
+#, c-format
+msgid "%s: compiled without -x support\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:498
+#, c-format
+msgid "%s: warning--unable to determine filesystem size \n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:508
+#, fuzzy, c-format
+msgid "%s is not a block device or file\n"
+msgstr "%s: dit apparaat is geen floppy\n"
+
+#: disk-utils/fsck.cramfs.c:514 disk-utils/fsck.cramfs.c:549
+#, c-format
+msgid "%s: invalid cramfs--file length too short\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:541
+#, c-format
+msgid "%s: invalid cramfs--wrong magic\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:554
+#, c-format
+msgid "%s: warning--file length too long, padded image?\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:564
+#, c-format
+msgid "%s: invalid cramfs--crc error\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:570
+#, c-format
+msgid "%s: warning--old cramfs image, no CRC\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:592
+#, c-format
+msgid "%s: invalid cramfs--bad superblock\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:608
+#, c-format
+msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:616
+#, c-format
+msgid "%s: invalid cramfs--invalid file data offset\n"
+msgstr ""
+
#: disk-utils/fsck.minix.c:200
#, fuzzy, c-format
msgid "Usage: %s [-larvsmf] /dev/name\n"
@@ -638,7 +743,7 @@ msgstr ""
msgid "not enough space, need at least %lu blocks"
msgstr ""
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2057
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2069
#, fuzzy, c-format
msgid "Device: %s\n"
msgstr "Schijf: %s\n"
@@ -724,6 +829,129 @@ msgstr "%s: Geheugen is vol!\n"
msgid "mkfs version %s (%s)\n"
msgstr "mkfs versie "
+#: disk-utils/mkfs.cramfs.c:49
+#, c-format
+msgid ""
+"usage: %s [-h] [-v] [-e edition] [-i file] [-n name] dirname outfile\n"
+" -h print this help\n"
+" -v be verbose\n"
+" -E make all warnings errors (non-zero exit status)\n"
+" -e edition set edition number (part of fsid)\n"
+" -i file insert a file image into the filesystem (requires >= 2.4.0)\n"
+" -n name set name of cramfs filesystem\n"
+" -p pad by %d bytes for boot code\n"
+" -s sort directory entries (old option, ignored)\n"
+" -z make explicit holes (requires >= 2.3.39)\n"
+" dirname root of the filesystem to be compressed\n"
+" outfile output file\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:213
+#, c-format
+msgid ""
+"Very long (%u bytes) filename `%s' found.\n"
+" Please increase MAX_INPUT_NAMELEN in mkcramfs.c and recompile. Exiting.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:371
+msgid "filesystem too big. Exiting.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:422
+msgid ""
+"Exceeded MAXENTRIES. Raise this value in mkcramfs.c and recompile. "
+"Exiting.\n"
+msgstr ""
+
+#. (I don't think this can happen with zlib.)
+#: disk-utils/mkfs.cramfs.c:520
+#, c-format
+msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:537
+#, c-format
+msgid "%6.2f%% (%+d bytes)\t%s\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:705
+#, c-format
+msgid ""
+"warning: guestimate of required size (upper bound) is %LdMB, but maximum "
+"image size is %uMB. We might die prematurely.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:747
+#, c-format
+msgid "Including: %s\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:753
+#, c-format
+msgid "Directory data: %d bytes\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:761
+#, c-format
+msgid "Everything: %d kilobytes\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:766
+#, c-format
+msgid "Super block: %d bytes\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:773
+#, c-format
+msgid "CRC: %x\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:778
+#, c-format
+msgid "not enough space allocated for ROM image (%Ld allocated, %d used)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:790
+#, c-format
+msgid "ROM image write failed (%d %d)\n"
+msgstr ""
+
+#. (These warnings used to come at the start, but they scroll off the
+#. screen too quickly.)
+#. (can't happen when reading from ext2fs)
+#. bytes, not chars: think UTF8.
+#: disk-utils/mkfs.cramfs.c:799
+msgid "warning: filenames truncated to 255 bytes.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:802
+msgid "warning: files were skipped due to errors.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:805
+#, c-format
+msgid "warning: file sizes truncated to %luMB (minus 1 byte).\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:810
+#, c-format
+msgid ""
+"warning: uids truncated to %u bits. (This may be a security concern.)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:815
+#, c-format
+msgid ""
+"warning: gids truncated to %u bits. (This may be a security concern.)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:820
+#, c-format
+msgid ""
+"WARNING: device numbers truncated to %u bits. This almost certainly means\n"
+"that some device files will be wrong.\n"
+msgstr ""
+
#: disk-utils/mkfs.minix.c:181
#, c-format
msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
@@ -868,7 +1096,7 @@ msgid "too many bad pages"
msgstr "Slechte primaire partitie"
#: disk-utils/mkswap.c:359 misc-utils/look.c:182 misc-utils/setterm.c:1130
-#: text-utils/more.c:2062 text-utils/more.c:2073
+#: text-utils/more.c:2063 text-utils/more.c:2074
msgid "Out of memory"
msgstr ""
@@ -1315,7 +1543,7 @@ msgstr " Logische"
#. odd flag on end
#. type id
#. type name
-#: fdisk/cfdisk.c:1996 fdisk/fdisk.c:1306 fdisk/fdisk.c:1594
+#: fdisk/cfdisk.c:1996 fdisk/fdisk.c:1318 fdisk/fdisk.c:1606
#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:690 fdisk/sfdisk.c:581
msgid "Unknown"
msgstr "Onbekend"
@@ -1832,7 +2060,7 @@ msgid ""
"\n"
msgstr ""
-#: fdisk/fdisk.c:194
+#: fdisk/fdisk.c:195
msgid ""
"Usage: fdisk [-b SSZ] [-u] DISK Change partition table\n"
" fdisk -l [-b SSZ] [-u] DISK List partition table(s)\n"
@@ -1844,7 +2072,7 @@ msgid ""
"-b 2048: (for certain MO disks) use 2048-byte sectors\n"
msgstr ""
-#: fdisk/fdisk.c:206
+#: fdisk/fdisk.c:207
msgid ""
"Usage: fdisk [-l] [-b SSZ] [-u] device\n"
"E.g.: fdisk /dev/hda (for the first IDE disk)\n"
@@ -1854,246 +2082,246 @@ msgid ""
" ...\n"
msgstr ""
-#: fdisk/fdisk.c:215
+#: fdisk/fdisk.c:216
#, c-format
msgid "Unable to open %s\n"
msgstr "Kan het bestand '%s' niet openen\n"
-#: fdisk/fdisk.c:219
+#: fdisk/fdisk.c:220
#, c-format
msgid "Unable to read %s\n"
msgstr "Kan het bestand '%s' niet lezen\n"
-#: fdisk/fdisk.c:223
+#: fdisk/fdisk.c:224
#, c-format
msgid "Unable to seek on %s\n"
msgstr "Kan het bestand '%s' niet positioneren\n"
-#: fdisk/fdisk.c:227
+#: fdisk/fdisk.c:228
#, c-format
msgid "Unable to write %s\n"
msgstr "Kan het bestand '%s' niet schrijven\n"
-#: fdisk/fdisk.c:231
+#: fdisk/fdisk.c:232
#, c-format
msgid "BLKGETSIZE ioctl failed on %s\n"
msgstr ""
-#: fdisk/fdisk.c:235
+#: fdisk/fdisk.c:236
msgid "Unable to allocate any more memory\n"
msgstr "Kan niet meer geheugen krijgen\n"
-#: fdisk/fdisk.c:238
+#: fdisk/fdisk.c:239
msgid "Fatal error\n"
msgstr "Fatale fout\n"
-#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:359 fdisk/fdisk.c:366
-#: fdisk/fdisk.c:389 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:439
-#: fdisk/fdiskbsdlabel.c:124
+#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:360 fdisk/fdisk.c:367
+#: fdisk/fdisk.c:390 fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:440
+#: fdisk/fdiskbsdlabel.c:129
#, fuzzy
msgid "Command action"
msgstr "Commando Betekenis"
-#: fdisk/fdisk.c:323
+#: fdisk/fdisk.c:324
msgid " a toggle a read only flag"
msgstr ""
#. sun
-#: fdisk/fdisk.c:324 fdisk/fdisk.c:368
+#: fdisk/fdisk.c:325 fdisk/fdisk.c:369
msgid " b edit bsd disklabel"
msgstr ""
-#: fdisk/fdisk.c:325
+#: fdisk/fdisk.c:326
msgid " c toggle the mountable flag"
msgstr ""
#. sun
-#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:370
+#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:371
msgid " d delete a partition"
msgstr " d Verwijder partitie"
-#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:371
+#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:372
msgid " l list known partition types"
msgstr " l geef alle bekende partitietypen"
#. sun
-#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:360 fdisk/fdisk.c:372
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
-#: fdisk/fdiskbsdlabel.c:129
+#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:361 fdisk/fdisk.c:373
+#: fdisk/fdisk.c:398 fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
+#: fdisk/fdiskbsdlabel.c:134
msgid " m print this menu"
msgstr ""
-#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
+#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374
msgid " n add a new partition"
msgstr " n maak een nieuwe partitie"
-#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:361 fdisk/fdisk.c:374
+#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:362 fdisk/fdisk.c:375
#, fuzzy
msgid " o create a new empty DOS partition table"
msgstr "Geef alleen de partitietabel"
-#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:375 fdisk/fdisk.c:398
-#: fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:376 fdisk/fdisk.c:399
+#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
#, fuzzy
msgid " p print the partition table"
msgstr "Geef alleen de partitietabel"
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:362 fdisk/fdisk.c:376
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
-#: fdisk/fdiskbsdlabel.c:132
+#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:363 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:450
+#: fdisk/fdiskbsdlabel.c:137
msgid " q quit without saving changes"
msgstr ""
-#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:363 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:364 fdisk/fdisk.c:378
msgid " s create a new empty Sun disklabel"
msgstr ""
#. sun
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
#, fuzzy
msgid " t change a partition's system id"
msgstr "Geef alleen de partitietabel"
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
msgid " u change display/entry units"
msgstr ""
-#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380 fdisk/fdisk.c:402
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:452
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381 fdisk/fdisk.c:403
+#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
#, fuzzy
msgid " v verify the partition table"
msgstr "Geef alleen de partitietabel"
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381 fdisk/fdisk.c:403
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:382 fdisk/fdisk.c:404
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
msgid " w write table to disk and exit"
msgstr ""
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:383
msgid " x extra functionality (experts only)"
msgstr ""
-#: fdisk/fdisk.c:342
+#: fdisk/fdisk.c:343
#, fuzzy
msgid " a select bootable partition"
msgstr " d Verwijder de huidige partitie"
#. sgi flavour
-#: fdisk/fdisk.c:343
+#: fdisk/fdisk.c:344
msgid " b edit bootfile entry"
msgstr ""
#. sgi
-#: fdisk/fdisk.c:344
+#: fdisk/fdisk.c:345
#, fuzzy
msgid " c select sgi swap partition"
msgstr " d Verwijder de huidige partitie"
-#: fdisk/fdisk.c:367
+#: fdisk/fdisk.c:368
msgid " a toggle a bootable flag"
msgstr ""
-#: fdisk/fdisk.c:369
+#: fdisk/fdisk.c:370
msgid " c toggle the dos compatibility flag"
msgstr ""
-#: fdisk/fdisk.c:390
+#: fdisk/fdisk.c:391
msgid " a change number of alternate cylinders"
msgstr ""
#. sun
-#: fdisk/fdisk.c:391 fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:441
+#: fdisk/fdisk.c:392 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
msgid " c change number of cylinders"
msgstr ""
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:393 fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:443
#, fuzzy
msgid " d print the raw data in the partition table"
msgstr "Geef alleen de partitietabel"
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:394
msgid " e change number of extra sectors per cylinder"
msgstr ""
#. sun
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:395 fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
msgid " h change number of heads"
msgstr ""
-#: fdisk/fdisk.c:395
+#: fdisk/fdisk.c:396
msgid " i change interleave factor"
msgstr ""
#. sun
-#: fdisk/fdisk.c:396
+#: fdisk/fdisk.c:397
msgid " o change rotation speed (rpm)"
msgstr ""
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:450
-#: fdisk/fdiskbsdlabel.c:133
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:451
+#: fdisk/fdiskbsdlabel.c:138
msgid " r return to main menu"
msgstr ""
-#: fdisk/fdisk.c:401 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:452
msgid " s change number of sectors/track"
msgstr ""
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:405
msgid " y change number of physical cylinders"
msgstr ""
-#: fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:440
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:441
msgid " b move beginning of data in a partition"
msgstr ""
-#: fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:443
+#: fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:444
#, fuzzy
msgid " e list extended partitions"
msgstr "Geen ruimte voor een uitgebreide partitie"
#. !sun
-#: fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
#, fuzzy
msgid " g create an IRIX (SGI) partition table"
msgstr "Geef alleen de partitietabel"
#. !sun
-#: fdisk/fdisk.c:444
+#: fdisk/fdisk.c:445
#, fuzzy
msgid " f fix partition order"
msgstr "Geef alleen de partitietabel"
-#: fdisk/fdisk.c:561
+#: fdisk/fdisk.c:562
msgid "You must set"
msgstr ""
-#: fdisk/fdisk.c:575
+#: fdisk/fdisk.c:576
msgid "heads"
msgstr ""
-#: fdisk/fdisk.c:577 fdisk/fdisk.c:1142 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:578 fdisk/fdisk.c:1154 fdisk/sfdisk.c:864
#, fuzzy
msgid "sectors"
msgstr "Sectoren"
-#: fdisk/fdisk.c:579 fdisk/fdisk.c:1142 fdisk/fdiskbsdlabel.c:464
+#: fdisk/fdisk.c:580 fdisk/fdisk.c:1154 fdisk/fdiskbsdlabel.c:469
#: fdisk/sfdisk.c:864
#, fuzzy
msgid "cylinders"
msgstr "%ld inodes\n"
-#: fdisk/fdisk.c:583
+#: fdisk/fdisk.c:584
#, c-format
msgid ""
"%s%s.\n"
"You can do this from the extra functions menu.\n"
msgstr ""
-#: fdisk/fdisk.c:584
+#: fdisk/fdisk.c:585
msgid " and "
msgstr ""
-#: fdisk/fdisk.c:601
+#: fdisk/fdisk.c:602
#, c-format
msgid ""
"\n"
@@ -2105,27 +2333,27 @@ msgid ""
" (e.g., DOS FDISK, OS/2 FDISK)\n"
msgstr ""
-#: fdisk/fdisk.c:624
+#: fdisk/fdisk.c:625
#, fuzzy
msgid "Bad offset in primary extended partition\n"
msgstr "Slechte primaire partitie"
-#: fdisk/fdisk.c:638
+#: fdisk/fdisk.c:639
#, fuzzy, c-format
msgid "Warning: deleting partitions after %d\n"
msgstr "Slechte primaire partitie"
-#: fdisk/fdisk.c:655
+#: fdisk/fdisk.c:656
#, fuzzy, c-format
msgid "Warning: extra link pointer in partition table %d\n"
msgstr "Slechte primaire partitie"
-#: fdisk/fdisk.c:663
+#: fdisk/fdisk.c:664
#, c-format
msgid "Warning: ignoring extra data in partition table %d\n"
msgstr ""
-#: fdisk/fdisk.c:708
+#: fdisk/fdisk.c:709
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"
@@ -2133,107 +2361,113 @@ msgid ""
"\n"
msgstr ""
-#: fdisk/fdisk.c:752
+#: fdisk/fdisk.c:753
#, c-format
msgid "Note: sector size is %d (not %d)\n"
msgstr ""
-#: fdisk/fdisk.c:870
+#: fdisk/fdisk.c:883
#, fuzzy
msgid "You will not be able to write the partition table.\n"
msgstr "Geef alleen de partitietabel"
-#: fdisk/fdisk.c:903
+#: fdisk/fdisk.c:914
+msgid ""
+"This disk has both DOS and BSD magic.\n"
+"Give the 'b' command to go to BSD mode.\n"
+msgstr ""
+
+#: fdisk/fdisk.c:924
msgid ""
"Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
"disklabel\n"
msgstr ""
-#: fdisk/fdisk.c:920
+#: fdisk/fdisk.c:942
#, fuzzy
msgid "Internal error\n"
msgstr "Interne fout"
-#: fdisk/fdisk.c:942
+#: fdisk/fdisk.c:954
#, fuzzy, c-format
msgid "Ignoring extra extended partition %d\n"
msgstr "Geen ruimte voor een uitgebreide partitie"
-#: fdisk/fdisk.c:954
+#: fdisk/fdisk.c:966
#, c-format
msgid ""
"Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
"(rite)\n"
msgstr ""
-#: fdisk/fdisk.c:976
+#: fdisk/fdisk.c:988
msgid ""
"\n"
"got EOF thrice - exiting..\n"
msgstr ""
-#: fdisk/fdisk.c:1015
+#: fdisk/fdisk.c:1027
msgid "Hex code (type L to list codes): "
msgstr ""
-#: fdisk/fdisk.c:1054
+#: fdisk/fdisk.c:1066
#, c-format
msgid "%s (%d-%d, default %d): "
msgstr ""
-#: fdisk/fdisk.c:1110
+#: fdisk/fdisk.c:1122
#, c-format
msgid "Using default value %d\n"
msgstr ""
-#: fdisk/fdisk.c:1114
+#: fdisk/fdisk.c:1126
msgid "Value out of range.\n"
msgstr ""
-#: fdisk/fdisk.c:1124
+#: fdisk/fdisk.c:1136
#, fuzzy
msgid "Partition number"
msgstr "Partitietabel voor %s\n"
-#: fdisk/fdisk.c:1133
+#: fdisk/fdisk.c:1145
#, fuzzy, c-format
msgid "Warning: partition %d has empty type\n"
msgstr "Schrijf nu de partitietabel naar schijf..."
-#: fdisk/fdisk.c:1140
+#: fdisk/fdisk.c:1152
#, fuzzy
msgid "cylinder"
msgstr "%ld inodes\n"
-#: fdisk/fdisk.c:1140
+#: fdisk/fdisk.c:1152
#, fuzzy
msgid "sector"
msgstr "Sectoren"
-#: fdisk/fdisk.c:1149
+#: fdisk/fdisk.c:1161
#, c-format
msgid "Changing display/entry units to %s\n"
msgstr ""
-#: fdisk/fdisk.c:1160
+#: fdisk/fdisk.c:1172
#, c-format
msgid "WARNING: Partition %d is an extended partition\n"
msgstr ""
-#: fdisk/fdisk.c:1171
+#: fdisk/fdisk.c:1183
msgid "DOS Compatibility flag is set\n"
msgstr ""
-#: fdisk/fdisk.c:1175
+#: fdisk/fdisk.c:1187
msgid "DOS Compatibility flag is not set\n"
msgstr ""
-#: fdisk/fdisk.c:1261
+#: fdisk/fdisk.c:1273
#, c-format
msgid "Partition %d does not exist yet!\n"
msgstr ""
-#: fdisk/fdisk.c:1266
+#: fdisk/fdisk.c:1278
msgid ""
"Type 0 means free space to many systems\n"
"(but not to Linux). Having partitions of\n"
@@ -2241,72 +2475,72 @@ msgid ""
"a partition using the `d' command.\n"
msgstr ""
-#: fdisk/fdisk.c:1275
+#: fdisk/fdisk.c:1287
msgid ""
"You cannot change a partition into an extended one or vice versa\n"
"Delete it first.\n"
msgstr ""
-#: fdisk/fdisk.c:1284
+#: fdisk/fdisk.c:1296
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:1290
+#: fdisk/fdisk.c:1302
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:1303
+#: fdisk/fdisk.c:1315
#, c-format
msgid "Changed system type of partition %d to %x (%s)\n"
msgstr ""
-#: fdisk/fdisk.c:1357
+#: fdisk/fdisk.c:1369
#, c-format
msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
msgstr ""
-#: fdisk/fdisk.c:1359 fdisk/fdisk.c:1367 fdisk/fdisk.c:1376 fdisk/fdisk.c:1385
+#: fdisk/fdisk.c:1371 fdisk/fdisk.c:1379 fdisk/fdisk.c:1388 fdisk/fdisk.c:1397
#, c-format
msgid " phys=(%d, %d, %d) "
msgstr ""
-#: fdisk/fdisk.c:1360 fdisk/fdisk.c:1368
+#: fdisk/fdisk.c:1372 fdisk/fdisk.c:1380
#, c-format
msgid "logical=(%d, %d, %d)\n"
msgstr ""
-#: fdisk/fdisk.c:1365
+#: fdisk/fdisk.c:1377
#, c-format
msgid "Partition %d has different physical/logical endings:\n"
msgstr ""
-#: fdisk/fdisk.c:1374
+#: fdisk/fdisk.c:1386
#, c-format
msgid "Partition %i does not start on cylinder boundary:\n"
msgstr ""
-#: fdisk/fdisk.c:1377
+#: fdisk/fdisk.c:1389
#, c-format
msgid "should be (%d, %d, 1)\n"
msgstr ""
-#: fdisk/fdisk.c:1383
+#: fdisk/fdisk.c:1395
#, c-format
msgid "Partition %i does not end on cylinder boundary:\n"
msgstr ""
-#: fdisk/fdisk.c:1386
+#: fdisk/fdisk.c:1398
#, c-format
msgid "should be (%d, %d, %d)\n"
msgstr ""
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1405
#, c-format
msgid ""
"\n"
@@ -2315,28 +2549,28 @@ msgid ""
"\n"
msgstr ""
-#: fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1513
msgid ""
"Nothing to do. Ordering is correct already.\n"
"\n"
msgstr ""
-#: fdisk/fdisk.c:1565
+#: fdisk/fdisk.c:1577
#, c-format
msgid "%*s Boot Start End Blocks Id System\n"
msgstr ""
-#: fdisk/fdisk.c:1566 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:675
+#: fdisk/fdisk.c:1578 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:675
msgid "Device"
msgstr ""
-#: fdisk/fdisk.c:1603
+#: fdisk/fdisk.c:1615
msgid ""
"\n"
"Partition table entries are not in disk order\n"
msgstr ""
-#: fdisk/fdisk.c:1613
+#: fdisk/fdisk.c:1625
#, c-format
msgid ""
"\n"
@@ -2344,92 +2578,92 @@ msgid ""
"\n"
msgstr ""
-#: fdisk/fdisk.c:1615
+#: fdisk/fdisk.c:1627
#, 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:1659
+#: fdisk/fdisk.c:1671
#, fuzzy, c-format
msgid "Warning: partition %d contains sector 0\n"
msgstr "Schrijf nu de partitietabel naar schijf..."
-#: fdisk/fdisk.c:1662
+#: fdisk/fdisk.c:1674
#, c-format
msgid "Partition %d: head %d greater than maximum %d\n"
msgstr ""
-#: fdisk/fdisk.c:1665
+#: fdisk/fdisk.c:1677
#, c-format
msgid "Partition %d: sector %d greater than maximum %d\n"
msgstr ""
-#: fdisk/fdisk.c:1668
+#: fdisk/fdisk.c:1680
#, c-format
msgid "Partitions %d: cylinder %d greater than maximum %d\n"
msgstr ""
-#: fdisk/fdisk.c:1672
+#: fdisk/fdisk.c:1684
#, c-format
msgid "Partition %d: previous sectors %d disagrees with total %d\n"
msgstr ""
-#: fdisk/fdisk.c:1704
+#: fdisk/fdisk.c:1716
#, fuzzy, c-format
msgid "Warning: bad start-of-data in partition %d\n"
msgstr "Slechte primaire partitie"
-#: fdisk/fdisk.c:1712
+#: fdisk/fdisk.c:1724
#, fuzzy, c-format
msgid "Warning: partition %d overlaps partition %d.\n"
msgstr "Schrijf nu de partitietabel naar schijf..."
-#: fdisk/fdisk.c:1732
+#: fdisk/fdisk.c:1744
#, fuzzy, c-format
msgid "Warning: partition %d is empty\n"
msgstr "Schrijf nu de partitietabel naar schijf..."
-#: fdisk/fdisk.c:1737
+#: fdisk/fdisk.c:1749
#, c-format
msgid "Logical partition %d not entirely in partition %d\n"
msgstr ""
-#: fdisk/fdisk.c:1743
+#: fdisk/fdisk.c:1755
#, c-format
msgid "Total allocated sectors %d greater than the maximum %d\n"
msgstr ""
-#: fdisk/fdisk.c:1746
+#: fdisk/fdisk.c:1758
#, c-format
msgid "%d unallocated sectors\n"
msgstr ""
-#: fdisk/fdisk.c:1759 fdisk/fdisksgilabel.c:661 fdisk/fdisksunlabel.c:505
+#: fdisk/fdisk.c:1771 fdisk/fdisksgilabel.c:661 fdisk/fdisksunlabel.c:505
#, c-format
msgid "Partition %d is already defined. Delete it before re-adding it.\n"
msgstr ""
-#: fdisk/fdisk.c:1780 fdisk/fdiskbsdlabel.c:279 fdisk/fdisksgilabel.c:683
+#: fdisk/fdisk.c:1792 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:683
#: fdisk/fdisksunlabel.c:520
#, c-format
msgid "First %s"
msgstr ""
-#: fdisk/fdisk.c:1795 fdisk/fdisksunlabel.c:561
+#: fdisk/fdisk.c:1807 fdisk/fdisksunlabel.c:561
#, c-format
msgid "Sector %d is already allocated\n"
msgstr ""
-#: fdisk/fdisk.c:1831
+#: fdisk/fdisk.c:1843
msgid "No free sectors available\n"
msgstr ""
-#: fdisk/fdisk.c:1840 fdisk/fdiskbsdlabel.c:286 fdisk/fdisksunlabel.c:572
+#: fdisk/fdisk.c:1852 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:572
#, c-format
msgid "Last %s or +size or +sizeM or +sizeK"
msgstr ""
-#: fdisk/fdisk.c:1905
+#: fdisk/fdisk.c:1917
msgid ""
"\tSorry - this fdisk cannot handle AIX disk labels.\n"
"\tIf you want to add DOS-type partitions, create\n"
@@ -2437,15 +2671,15 @@ msgid ""
"\tWARNING: This will destroy the present disk contents.\n"
msgstr ""
-#: fdisk/fdisk.c:1914 fdisk/fdiskbsdlabel.c:613
+#: fdisk/fdisk.c:1926 fdisk/fdiskbsdlabel.c:617
msgid "The maximum number of partitions has been created\n"
msgstr ""
-#: fdisk/fdisk.c:1924
+#: fdisk/fdisk.c:1936
msgid "You must delete some partition and add an extended partition first\n"
msgstr ""
-#: fdisk/fdisk.c:1929
+#: fdisk/fdisk.c:1941
#, c-format
msgid ""
"Command action\n"
@@ -2453,32 +2687,32 @@ msgid ""
" p primary partition (1-4)\n"
msgstr ""
-#: fdisk/fdisk.c:1931
+#: fdisk/fdisk.c:1943
msgid "l logical (5 or over)"
msgstr ""
-#: fdisk/fdisk.c:1931
+#: fdisk/fdisk.c:1943
msgid "e extended"
msgstr ""
-#: fdisk/fdisk.c:1948
+#: fdisk/fdisk.c:1960
#, c-format
msgid "Invalid partition number for type `%c'\n"
msgstr ""
-#: fdisk/fdisk.c:1984
+#: fdisk/fdisk.c:1996
#, fuzzy
msgid ""
"The partition table has been altered!\n"
"\n"
msgstr "Partitietabel is weggeschreven"
-#: fdisk/fdisk.c:1993
+#: fdisk/fdisk.c:2005
#, fuzzy
msgid "Calling ioctl() to re-read partition table.\n"
msgstr "Geef alleen de partitietabel"
-#: fdisk/fdisk.c:2009
+#: fdisk/fdisk.c:2021
#, c-format
msgid ""
"\n"
@@ -2487,7 +2721,7 @@ msgid ""
"The new table will be used at the next reboot.\n"
msgstr ""
-#: fdisk/fdisk.c:2019
+#: fdisk/fdisk.c:2031
#, fuzzy
msgid ""
"\n"
@@ -2499,99 +2733,98 @@ 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:2026
+#: fdisk/fdisk.c:2038
msgid "Syncing disks.\n"
msgstr ""
-#: fdisk/fdisk.c:2073
+#: fdisk/fdisk.c:2085
#, fuzzy, c-format
msgid "Partition %d has no data area\n"
msgstr "Partitie eindigt voor sector 0"
-#: fdisk/fdisk.c:2078
+#: fdisk/fdisk.c:2090
msgid "New beginning of data"
msgstr ""
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2106
msgid "Expert command (m for help): "
msgstr ""
-#: fdisk/fdisk.c:2107
+#: fdisk/fdisk.c:2119
#, fuzzy
msgid "Number of cylinders"
msgstr "%ld inodes\n"
-#: fdisk/fdisk.c:2134
+#: fdisk/fdisk.c:2146
msgid "Number of heads"
msgstr ""
-#: fdisk/fdisk.c:2159
+#: fdisk/fdisk.c:2171
#, fuzzy
msgid "Number of sectors"
msgstr " sectoren"
-#: fdisk/fdisk.c:2162
+#: fdisk/fdisk.c:2174
msgid "Warning: setting sector offset for DOS compatiblity\n"
msgstr ""
-#: fdisk/fdisk.c:2237
+#: fdisk/fdisk.c:2249
#, c-format
msgid "Disk %s doesn't contain a valid partition table\n"
msgstr ""
-#: fdisk/fdisk.c:2251
+#: fdisk/fdisk.c:2263
#, fuzzy, c-format
msgid "Cannot open %s\n"
msgstr "Kan het bestand '%s' niet openen"
-#: fdisk/fdisk.c:2267 fdisk/sfdisk.c:2363
+#: fdisk/fdisk.c:2279 fdisk/sfdisk.c:2363
#, fuzzy, c-format
msgid "cannot open %s\n"
msgstr "Kan het bestand '%s' niet openen"
-#: fdisk/fdisk.c:2289
+#: fdisk/fdisk.c:2301
#, c-format
msgid "%c: unknown command\n"
msgstr ""
-#: fdisk/fdisk.c:2339
+#: fdisk/fdisk.c:2351
msgid "This kernel finds the sector size itself - -b option ignored\n"
msgstr ""
-#: fdisk/fdisk.c:2342
+#: fdisk/fdisk.c:2355
msgid ""
"Warning: the -b (set sector size) option should be used with one specified "
"device\n"
msgstr ""
-#: fdisk/fdisk.c:2405
+#. OSF label, and no DOS label
+#: fdisk/fdisk.c:2414
#, c-format
-msgid ""
-"Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
-"To return to DOS partition table mode, use the 'r' command.\n"
+msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
msgstr ""
-#: fdisk/fdisk.c:2413
+#: fdisk/fdisk.c:2424
msgid "Command (m for help): "
msgstr ""
-#: fdisk/fdisk.c:2429
+#: fdisk/fdisk.c:2440
#, c-format
msgid ""
"\n"
"The current boot file is: %s\n"
msgstr ""
-#: fdisk/fdisk.c:2431
+#: fdisk/fdisk.c:2442
msgid "Please enter the name of the new boot file: "
msgstr ""
-#: fdisk/fdisk.c:2433
+#: fdisk/fdisk.c:2444
#, fuzzy
msgid "Boot file unchanged\n"
msgstr "De schijfinhoud is gewijzigd.\n"
-#: fdisk/fdisk.c:2497
+#: fdisk/fdisk.c:2508
msgid ""
"\n"
"\tSorry, no experts menu for SGI partition tables available.\n"
@@ -2614,282 +2847,282 @@ msgid ""
"\t machine. (Otherwise you become an AIXpert)."
msgstr ""
-#: fdisk/fdiskbsdlabel.c:117
+#: fdisk/fdiskbsdlabel.c:122
#, c-format
msgid ""
"\n"
"BSD label for device: %s\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:125
+#: fdisk/fdiskbsdlabel.c:130
#, fuzzy
msgid " d delete a BSD partition"
msgstr " d Verwijder de huidige partitie"
-#: fdisk/fdiskbsdlabel.c:126
+#: fdisk/fdiskbsdlabel.c:131
msgid " e edit drive data"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:127
+#: fdisk/fdiskbsdlabel.c:132
msgid " i install bootstrap"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:128
+#: fdisk/fdiskbsdlabel.c:133
msgid " l list known filesystem types"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:130
+#: fdisk/fdiskbsdlabel.c:135
#, fuzzy
msgid " n add a new BSD partition"
msgstr "Maak een nieuwe primaire partitie"
-#: fdisk/fdiskbsdlabel.c:131
+#: fdisk/fdiskbsdlabel.c:136
#, fuzzy
msgid " p print BSD partition table"
msgstr "Geef alleen de partitietabel"
-#: fdisk/fdiskbsdlabel.c:134
+#: fdisk/fdiskbsdlabel.c:139
msgid " s show complete disklabel"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:135
+#: fdisk/fdiskbsdlabel.c:140
msgid " t change a partition's filesystem id"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:136
+#: fdisk/fdiskbsdlabel.c:141
msgid " u change units (cylinders/sectors)"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:137
+#: fdisk/fdiskbsdlabel.c:142
msgid " w write disklabel to disk"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:139
+#: fdisk/fdiskbsdlabel.c:144
msgid " x link BSD partition to non-BSD partition"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:171
+#: fdisk/fdiskbsdlabel.c:176
#, fuzzy, c-format
msgid "Partition %s has invalid starting sector 0.\n"
msgstr "Partitie eindigt voor sector 0"
-#: fdisk/fdiskbsdlabel.c:175
+#: fdisk/fdiskbsdlabel.c:180
#, fuzzy, c-format
msgid "Reading disklabel of %s at sector %d.\n"
msgstr "Partitietabel voor %s\n"
-#: fdisk/fdiskbsdlabel.c:185
+#: fdisk/fdiskbsdlabel.c:190
#, fuzzy, c-format
msgid "There is no *BSD partition on %s.\n"
msgstr "Heb de partitietabel niet naar schijf geschreven"
-#: fdisk/fdiskbsdlabel.c:199
+#: fdisk/fdiskbsdlabel.c:204
msgid "BSD disklabel command (m for help): "
msgstr ""
-#: fdisk/fdiskbsdlabel.c:313
+#: fdisk/fdiskbsdlabel.c:318
#, c-format
msgid "type: %s\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:315
+#: fdisk/fdiskbsdlabel.c:320
#, c-format
msgid "type: %d\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:316
+#: fdisk/fdiskbsdlabel.c:321
#, fuzzy, c-format
msgid "disk: %.*s\n"
msgstr "Schijf: %s\n"
-#: fdisk/fdiskbsdlabel.c:317
+#: fdisk/fdiskbsdlabel.c:322
#, c-format
msgid "label: %.*s\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:318
+#: fdisk/fdiskbsdlabel.c:323
#, fuzzy
msgid "flags:"
msgstr "Vlaggen"
-#: fdisk/fdiskbsdlabel.c:320
+#: fdisk/fdiskbsdlabel.c:325
#, fuzzy
msgid " removable"
msgstr "Startbaar"
-#: fdisk/fdiskbsdlabel.c:322
+#: fdisk/fdiskbsdlabel.c:327
msgid " ecc"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:324
+#: fdisk/fdiskbsdlabel.c:329
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:328
+#: fdisk/fdiskbsdlabel.c:333
#, c-format
msgid "bytes/sector: %ld\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:329
+#: fdisk/fdiskbsdlabel.c:334
#, c-format
msgid "sectors/track: %ld\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:330
+#: fdisk/fdiskbsdlabel.c:335
#, c-format
msgid "tracks/cylinder: %ld\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:331
+#: fdisk/fdiskbsdlabel.c:336
#, c-format
msgid "sectors/cylinder: %ld\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:332
+#: fdisk/fdiskbsdlabel.c:337
#, fuzzy, c-format
msgid "cylinders: %ld\n"
msgstr "%ld inodes\n"
-#: fdisk/fdiskbsdlabel.c:333
+#: fdisk/fdiskbsdlabel.c:338
#, c-format
msgid "rpm: %d\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:334
+#: fdisk/fdiskbsdlabel.c:339
#, c-format
msgid "interleave: %d\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:335
+#: fdisk/fdiskbsdlabel.c:340
#, c-format
msgid "trackskew: %d\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:336
+#: fdisk/fdiskbsdlabel.c:341
#, fuzzy, c-format
msgid "cylinderskew: %d\n"
msgstr "%ld inodes\n"
-#: fdisk/fdiskbsdlabel.c:337
+#: fdisk/fdiskbsdlabel.c:342
#, c-format
msgid "headswitch: %ld\t\t# milliseconds\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:339
+#: fdisk/fdiskbsdlabel.c:344
#, c-format
msgid "track-to-track seek: %ld\t# milliseconds\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:341
+#: fdisk/fdiskbsdlabel.c:346
msgid "drivedata: "
msgstr ""
-#: fdisk/fdiskbsdlabel.c:350
+#: fdisk/fdiskbsdlabel.c:355
#, fuzzy, c-format
msgid ""
"\n"
"%d partitions:\n"
msgstr "Maak geen partitie"
-#: fdisk/fdiskbsdlabel.c:351
+#: fdisk/fdiskbsdlabel.c:356
msgid "# start end size fstype [fsize bsize cpg]\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:400 fdisk/fdiskbsdlabel.c:403
+#: fdisk/fdiskbsdlabel.c:405 fdisk/fdiskbsdlabel.c:408
#, fuzzy, c-format
msgid "Writing disklabel to %s.\n"
msgstr "Partitietabel voor %s\n"
-#: fdisk/fdiskbsdlabel.c:415 fdisk/fdiskbsdlabel.c:417
+#: fdisk/fdiskbsdlabel.c:420 fdisk/fdiskbsdlabel.c:422
#, c-format
msgid "%s contains no disklabel.\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:422
+#: fdisk/fdiskbsdlabel.c:427
msgid "Do you want to create a disklabel? (y/n) "
msgstr ""
-#: fdisk/fdiskbsdlabel.c:461
+#: fdisk/fdiskbsdlabel.c:466
#, fuzzy
msgid "bytes/sector"
msgstr "Sectoren"
-#: fdisk/fdiskbsdlabel.c:462
+#: fdisk/fdiskbsdlabel.c:467
#, fuzzy
msgid "sectors/track"
msgstr "Sectoren"
-#: fdisk/fdiskbsdlabel.c:463
+#: fdisk/fdiskbsdlabel.c:468
#, fuzzy
msgid "tracks/cylinder"
msgstr "%ld inodes\n"
-#: fdisk/fdiskbsdlabel.c:471
+#: fdisk/fdiskbsdlabel.c:476
#, fuzzy
msgid "sectors/cylinder"
msgstr "%ld inodes\n"
-#: fdisk/fdiskbsdlabel.c:475
+#: fdisk/fdiskbsdlabel.c:480
msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:477
+#: fdisk/fdiskbsdlabel.c:482
msgid "rpm"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:478
+#: fdisk/fdiskbsdlabel.c:483
msgid "interleave"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:479
+#: fdisk/fdiskbsdlabel.c:484
msgid "trackskew"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:480
+#: fdisk/fdiskbsdlabel.c:485
#, fuzzy
msgid "cylinderskew"
msgstr "%ld inodes\n"
-#: fdisk/fdiskbsdlabel.c:481
+#: fdisk/fdiskbsdlabel.c:486
msgid "headswitch"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:482
+#: fdisk/fdiskbsdlabel.c:487
msgid "track-to-track seek"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:523
+#: fdisk/fdiskbsdlabel.c:528
#, c-format
msgid "Bootstrap: %sboot -> boot%s (%s): "
msgstr ""
-#: fdisk/fdiskbsdlabel.c:548
+#: fdisk/fdiskbsdlabel.c:553
msgid "Bootstrap overlaps with disk label!\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:569 fdisk/fdiskbsdlabel.c:571
+#: fdisk/fdiskbsdlabel.c:574 fdisk/fdiskbsdlabel.c:576
#, c-format
msgid "Bootstrap installed on %s.\n"
msgstr ""
-#: fdisk/fdiskbsdlabel.c:593
+#: fdisk/fdiskbsdlabel.c:598
#, c-format
msgid "Partition (a-%c): "
msgstr ""
-#: fdisk/fdiskbsdlabel.c:624
+#: fdisk/fdiskbsdlabel.c:629
#, fuzzy
msgid "This partition already exists.\n"
msgstr "Partitietabel is weggeschreven"
-#: fdisk/fdiskbsdlabel.c:744
+#: fdisk/fdiskbsdlabel.c:755
#, fuzzy, c-format
msgid "Warning: too many partitions (%d, maximum is %d).\n"
msgstr "Schrijf nu de partitietabel naar schijf..."
-#: fdisk/fdiskbsdlabel.c:791
+#: fdisk/fdiskbsdlabel.c:803
msgid ""
"\n"
"Syncing disks.\n"
@@ -4678,183 +4911,169 @@ msgstr ""
msgid "internal error, contact the author."
msgstr ""
-#: hwclock/cmos.c:168
+#: hwclock/cmos.c:172
msgid "booted from MILO\n"
msgstr "met MILO gestart\n"
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:181
msgid "Ruffian BCD clock\n"
msgstr "Ruffian BCD klok\n"
-#: hwclock/cmos.c:193
+#: hwclock/cmos.c:197
#, c-format
msgid "clockport adjusted to 0x%x\n"
msgstr "klokpoort aangepast, nu 0x%x\n"
-#: hwclock/cmos.c:205
+#: hwclock/cmos.c:209
msgid "funky TOY!\n"
msgstr "gekke TOY!\n"
-#: hwclock/cmos.c:259
+#: hwclock/cmos.c:263
#, c-format
msgid "%s: atomic %s failed for 1000 iterations!"
msgstr ""
-#: hwclock/cmos.c:583
+#: hwclock/cmos.c:587
#, c-format
msgid "Cannot open /dev/port: %s"
msgstr "Kan /dev/port niet openen: %s"
-#: hwclock/cmos.c:590
+#: hwclock/cmos.c:594
msgid "I failed to get permission because I didn't try.\n"
msgstr ""
-#: hwclock/cmos.c:593
+#: hwclock/cmos.c:597
#, c-format
msgid "%s is unable to get I/O port access: the iopl(3) call failed.\n"
msgstr ""
-#: hwclock/cmos.c:596
+#: hwclock/cmos.c:600
msgid "Probably you need root privileges.\n"
msgstr ""
-#: hwclock/hwclock.c:219
+#: hwclock/hwclock.c:223
#, c-format
msgid "Assuming hardware clock is kept in %s time.\n"
msgstr ""
-#: hwclock/hwclock.c:220 hwclock/hwclock.c:314
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
msgid "UTC"
msgstr ""
-#: hwclock/hwclock.c:220 hwclock/hwclock.c:313
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
#, fuzzy
msgid "local"
msgstr "Logische"
-#: hwclock/hwclock.c:297
+#: hwclock/hwclock.c:303
#, c-format
msgid "%s: Warning: unrecognized third line in adjtime file\n"
msgstr ""
-#: hwclock/hwclock.c:299
+#: hwclock/hwclock.c:305
msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
msgstr ""
-#: hwclock/hwclock.c:308
+#: hwclock/hwclock.c:312
#, c-format
msgid "Last drift adjustment done at %ld seconds after 1969\n"
msgstr ""
-#: hwclock/hwclock.c:310
+#: hwclock/hwclock.c:314
#, c-format
msgid "Last calibration done at %ld seconds after 1969\n"
msgstr ""
-#: hwclock/hwclock.c:312
+#: hwclock/hwclock.c:316
#, c-format
msgid "Hardware clock is on %s time\n"
msgstr ""
-#: hwclock/hwclock.c:314
+#: hwclock/hwclock.c:318
#, fuzzy
msgid "unknown"
msgstr "Onbekend"
-#. -----------------------------------------------------------------------------
-#. 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.
-#.
-#. -----------------------------------------------------------------------------
-#: hwclock/hwclock.c:336
+#: hwclock/hwclock.c:342
msgid "Waiting for clock tick...\n"
msgstr ""
-#: hwclock/hwclock.c:340
+#: hwclock/hwclock.c:346
msgid "...got clock tick\n"
msgstr ""
-#: hwclock/hwclock.c:391
+#: hwclock/hwclock.c:399
#, c-format
msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
msgstr ""
-#: hwclock/hwclock.c:399
+#: hwclock/hwclock.c:407
#, c-format
msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
msgstr ""
-#: hwclock/hwclock.c:427
+#: hwclock/hwclock.c:435
#, c-format
msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
msgstr ""
-#: hwclock/hwclock.c:454
+#: hwclock/hwclock.c:462
#, c-format
msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
msgstr ""
-#: hwclock/hwclock.c:460
+#: hwclock/hwclock.c:468
msgid "Clock not changed - testing only.\n"
msgstr ""
-#: hwclock/hwclock.c:508
+#: hwclock/hwclock.c:516
#, c-format
msgid ""
"Time elapsed since reference time has been %.6f seconds.\n"
"Delaying further to reach the next full second.\n"
msgstr ""
-#: hwclock/hwclock.c:532
+#: hwclock/hwclock.c:540
msgid ""
"The Hardware Clock registers contain values that are either invalid (e.g. "
"50th day of month) or beyond the range we can handle (e.g. Year 2095).\n"
msgstr ""
-#: hwclock/hwclock.c:542
+#: hwclock/hwclock.c:550
#, c-format
msgid "%s %.6f seconds\n"
msgstr ""
-#: hwclock/hwclock.c:576
+#: hwclock/hwclock.c:584
#, fuzzy
msgid "No --date option specified.\n"
msgstr "Maak geen partitie"
-#: hwclock/hwclock.c:582
+#: hwclock/hwclock.c:590
msgid "--date argument too long\n"
msgstr ""
-#: hwclock/hwclock.c:589
+#: hwclock/hwclock.c:597
msgid ""
"The value of the --date option is not a valid date.\n"
"In particular, it contains quotation marks.\n"
msgstr ""
-#: hwclock/hwclock.c:597
+#: hwclock/hwclock.c:605
#, c-format
msgid "Issuing date command: %s\n"
msgstr ""
-#: hwclock/hwclock.c:601
+#: hwclock/hwclock.c:609
msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
msgstr ""
-#: hwclock/hwclock.c:609
+#: hwclock/hwclock.c:617
#, c-format
msgid "response from date command = %s\n"
msgstr ""
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:619
#, c-format
msgid ""
"The date command issued by %s returned unexpected results.\n"
@@ -4864,7 +5083,7 @@ msgid ""
" %s\n"
msgstr ""
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:631
#, c-format
msgid ""
"The date command issued by %s returned something other than an integer where "
@@ -4875,112 +5094,118 @@ msgid ""
" %s\n"
msgstr ""
-#: hwclock/hwclock.c:634
+#: hwclock/hwclock.c:642
#, c-format
msgid "date string %s equates to %ld seconds since 1969.\n"
msgstr ""
-#: hwclock/hwclock.c:666
+#: hwclock/hwclock.c:674
msgid ""
"The Hardware Clock does not contain a valid time, so we cannot set the "
"System Time from it.\n"
msgstr ""
-#: hwclock/hwclock.c:688
+#: hwclock/hwclock.c:696
msgid "Calling settimeofday:\n"
msgstr ""
-#: hwclock/hwclock.c:689
+#: hwclock/hwclock.c:697
#, c-format
msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
msgstr ""
-#: hwclock/hwclock.c:691
+#: hwclock/hwclock.c:699
#, c-format
msgid "\ttz.tz_minuteswest = %d\n"
msgstr ""
-#: hwclock/hwclock.c:694
+#: hwclock/hwclock.c:702
msgid "Not setting system clock because running in test mode.\n"
msgstr ""
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:711
msgid "Must be superuser to set system clock.\n"
msgstr ""
-#: hwclock/hwclock.c:704
+#: hwclock/hwclock.c:714
msgid "settimeofday() failed"
msgstr ""
-#: hwclock/hwclock.c:737
+#: hwclock/hwclock.c:744
msgid ""
"Not adjusting drift factor because the Hardware Clock previously contained "
"garbage.\n"
msgstr ""
-#: hwclock/hwclock.c:741
+#: hwclock/hwclock.c:749
+msgid ""
+"Not adjusting drift factor because last calibration time is zero,\n"
+"so history is bad and calibration startover is necessary.\n"
+msgstr ""
+
+#: hwclock/hwclock.c:755
msgid ""
"Not adjusting drift factor because it has been less than a day since the "
"last calibration.\n"
msgstr ""
-#: hwclock/hwclock.c:750
+#: hwclock/hwclock.c:803
#, c-format
msgid ""
-"Clock drifted %d seconds in the past %d seconds in spite of a drift factor "
+"Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
"of %f seconds/day.\n"
"Adjusting drift factor by %f seconds/day\n"
msgstr ""
-#: hwclock/hwclock.c:801
+#: hwclock/hwclock.c:854
#, c-format
msgid "Time since last adjustment is %d seconds\n"
msgstr ""
-#: hwclock/hwclock.c:803
+#: hwclock/hwclock.c:856
#, c-format
msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
msgstr ""
-#: hwclock/hwclock.c:832
+#: hwclock/hwclock.c:885
msgid "Not updating adjtime file because of testing mode.\n"
msgstr ""
-#: hwclock/hwclock.c:833
+#: hwclock/hwclock.c:886
#, c-format
msgid ""
"Would have written the following to %s:\n"
"%s"
msgstr ""
-#: hwclock/hwclock.c:857
+#: hwclock/hwclock.c:910
msgid "Drift adjustment parameters not updated.\n"
msgstr ""
-#: hwclock/hwclock.c:898
+#: hwclock/hwclock.c:951
msgid ""
"The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
msgstr ""
-#: hwclock/hwclock.c:922
+#: hwclock/hwclock.c:983
msgid "Needed adjustment is less than one second, so not setting clock.\n"
msgstr ""
-#: hwclock/hwclock.c:948
+#: hwclock/hwclock.c:1009
#, c-format
msgid "Using %s.\n"
msgstr ""
-#: hwclock/hwclock.c:950
+#: hwclock/hwclock.c:1011
msgid "No usable clock interface found.\n"
msgstr ""
-#: hwclock/hwclock.c:1045
+#: hwclock/hwclock.c:1107
#, fuzzy
msgid "Unable to set system clock.\n"
msgstr "Kan het bestand '%s' niet positioneren\n"
-#: hwclock/hwclock.c:1076
+#: hwclock/hwclock.c:1137
msgid ""
"The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
"machine.\n"
@@ -4988,31 +5213,31 @@ msgid ""
"(and thus is presumably not running on an Alpha now). No action taken.\n"
msgstr ""
-#: hwclock/hwclock.c:1085
+#: hwclock/hwclock.c:1146
msgid "Unable to get the epoch value from the kernel.\n"
msgstr ""
-#: hwclock/hwclock.c:1087
+#: hwclock/hwclock.c:1148
#, c-format
msgid "Kernel is assuming an epoch value of %lu\n"
msgstr ""
-#: hwclock/hwclock.c:1090
+#: hwclock/hwclock.c:1151
msgid ""
"To set the epoch value, you must use the 'epoch' option to tell to what "
"value to set it.\n"
msgstr ""
-#: hwclock/hwclock.c:1093
+#: hwclock/hwclock.c:1154
#, c-format
msgid "Not setting the epoch to %d - testing only.\n"
msgstr ""
-#: hwclock/hwclock.c:1096
+#: hwclock/hwclock.c:1157
msgid "Unable to set the epoch value in the kernel.\n"
msgstr ""
-#: hwclock/hwclock.c:1125
+#: hwclock/hwclock.c:1191
#, c-format
msgid ""
"hwclock - query and set the hardware clock (RTC)\n"
@@ -5044,160 +5269,155 @@ msgid ""
" either --utc or --localtime\n"
msgstr ""
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1218
msgid ""
" --jensen, --arc, --srm, --funky-toy\n"
" tell hwclock the type of alpha you have (see hwclock(8))\n"
msgstr ""
-#: hwclock/hwclock.c:1257
+#: hwclock/hwclock.c:1392
#, c-format
msgid "%s takes no non-option arguments. You supplied %d.\n"
msgstr ""
-#: hwclock/hwclock.c:1267
+#: hwclock/hwclock.c:1398
msgid ""
-"You have specified multiple function options.\n"
+"You have specified multiple functions.\n"
"You can only perform one function at a time.\n"
msgstr ""
-#: hwclock/hwclock.c:1273
+#: hwclock/hwclock.c:1405
#, c-format
msgid ""
"%s: The --utc and --localtime options are mutually exclusive. You specified "
"both.\n"
msgstr ""
-#: hwclock/hwclock.c:1279
+#: hwclock/hwclock.c:1412
#, c-format
msgid ""
"%s: The --adjust and --noadjfile options are mutually exclusive. You "
"specified both.\n"
msgstr ""
-#: hwclock/hwclock.c:1285
+#: hwclock/hwclock.c:1419
#, c-format
msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
msgstr ""
-#: hwclock/hwclock.c:1298
+#: hwclock/hwclock.c:1433
msgid "No usable set-to time. Cannot set clock.\n"
msgstr ""
-#: hwclock/hwclock.c:1313
+#: hwclock/hwclock.c:1449
msgid "Sorry, only the superuser can change the Hardware Clock.\n"
msgstr ""
-#: hwclock/hwclock.c:1317
+#: hwclock/hwclock.c:1454
msgid "Sorry, only the superuser can change the System Clock.\n"
msgstr ""
-#: hwclock/hwclock.c:1321
+#: hwclock/hwclock.c:1459
msgid ""
"Sorry, only the superuser can change the Hardware Clock epoch in the "
"kernel.\n"
msgstr ""
-#: hwclock/hwclock.c:1341
+#: hwclock/hwclock.c:1479
msgid "Cannot access the Hardware Clock via any known method.\n"
msgstr ""
-#: hwclock/hwclock.c:1344
+#: hwclock/hwclock.c:1483
msgid ""
"Use the --debug option to see the details of our search for an access "
"method.\n"
msgstr ""
-#: hwclock/kd.c:42
+#: hwclock/kd.c:43
msgid "Waiting in loop for time from KDGHWCLK to change\n"
msgstr ""
-#: hwclock/kd.c:45
+#: hwclock/kd.c:46
msgid "KDGHWCLK ioctl to read time failed"
msgstr ""
-#: hwclock/kd.c:66 hwclock/rtc.c:174
+#: hwclock/kd.c:67 hwclock/rtc.c:187
msgid "Timed out waiting for time change.\n"
msgstr ""
-#: hwclock/kd.c:70
+#: hwclock/kd.c:71
msgid "KDGHWCLK ioctl to read time failed in loop"
msgstr ""
-#: hwclock/kd.c:92
+#: hwclock/kd.c:93
#, c-format
msgid "ioctl() failed to read time from %s"
msgstr ""
-#: hwclock/kd.c:128
+#: hwclock/kd.c:129
msgid "ioctl KDSHWCLK failed"
msgstr ""
-#: hwclock/kd.c:165
+#: hwclock/kd.c:166
#, fuzzy
msgid "Can't open /dev/tty1 or /dev/vc/1"
msgstr "Kan schijf niet openen"
-#: hwclock/kd.c:170
+#: hwclock/kd.c:171
msgid "KDGHWCLK ioctl failed"
msgstr ""
-#: hwclock/rtc.c:136
+#: hwclock/rtc.c:115 hwclock/rtc.c:208
#, c-format
-msgid "ioctl() to %s to read the time failed.\n"
+msgid "open() of %s failed"
msgstr ""
-#: hwclock/rtc.c:158
+#: hwclock/rtc.c:149
#, c-format
-msgid "Waiting in loop for time from %s to change\n"
+msgid "ioctl() to %s to read the time failed.\n"
msgstr ""
-#: hwclock/rtc.c:195 hwclock/rtc.c:250
+#: hwclock/rtc.c:171
#, c-format
-msgid "open() of %s failed"
+msgid "Waiting in loop for time from %s to change\n"
msgstr ""
-#: hwclock/rtc.c:213
+#: hwclock/rtc.c:226
#, c-format
msgid "%s does not have interrupt functions. "
msgstr ""
-#: hwclock/rtc.c:222
+#: hwclock/rtc.c:235
#, c-format
msgid "read() to %s to wait for clock tick failed"
msgstr ""
-#: hwclock/rtc.c:231
+#: hwclock/rtc.c:244
#, c-format
msgid "ioctl() to %s to turn off update interrupts failed"
msgstr ""
-#: hwclock/rtc.c:234
+#: hwclock/rtc.c:247
#, c-format
msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
msgstr ""
-#: hwclock/rtc.c:274 hwclock/rtc.c:358 hwclock/rtc.c:404
-#, fuzzy, c-format
-msgid "Unable to open %s"
-msgstr "Kan het bestand '%s' niet openen\n"
-
-#: hwclock/rtc.c:300
+#: hwclock/rtc.c:306
#, c-format
msgid "ioctl() to %s to set the time failed.\n"
msgstr ""
-#: hwclock/rtc.c:306
+#: hwclock/rtc.c:312
#, c-format
msgid "ioctl(%s) was successful.\n"
msgstr ""
-#: hwclock/rtc.c:335
+#: hwclock/rtc.c:341
#, c-format
msgid "Open of %s failed"
msgstr ""
-#: hwclock/rtc.c:353 hwclock/rtc.c:399
+#: hwclock/rtc.c:359 hwclock/rtc.c:405
#, c-format
msgid ""
"To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
@@ -5205,12 +5425,17 @@ msgid ""
"this system.\n"
msgstr ""
-#: hwclock/rtc.c:365
+#: hwclock/rtc.c:364 hwclock/rtc.c:410
+#, fuzzy, c-format
+msgid "Unable to open %s"
+msgstr "Kan het bestand '%s' niet openen\n"
+
+#: hwclock/rtc.c:371
#, c-format
msgid "ioctl(RTC_EPOCH_READ) to %s failed"
msgstr ""
-#: hwclock/rtc.c:371
+#: hwclock/rtc.c:377
#, c-format
msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
msgstr ""
@@ -5218,57 +5443,27 @@ msgstr ""
#. kernel would not accept this epoch value
#. Hmm - bad habit, deciding not to do what the user asks
#. just because one believes that the kernel might not like it.
-#: hwclock/rtc.c:391
+#: hwclock/rtc.c:397
#, c-format
msgid "The epoch value may not be less than 1900. You requested %ld\n"
msgstr ""
-#: hwclock/rtc.c:409
+#: hwclock/rtc.c:415
#, c-format
msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
msgstr ""
-#: hwclock/rtc.c:414
+#: hwclock/rtc.c:420
#, c-format
msgid ""
"The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
msgstr ""
-#: hwclock/rtc.c:417
+#: hwclock/rtc.c:423
#, c-format
msgid "ioctl(RTC_EPOCH_SET) to %s failed"
msgstr ""
-#: hwclock/shhopt.c:255 hwclock/shhopt.c:281
-#, c-format
-msgid "invalid number `%s'\n"
-msgstr ""
-
-#: hwclock/shhopt.c:258 hwclock/shhopt.c:284
-#, c-format
-msgid "number `%s' to `%s' out of range\n"
-msgstr ""
-
-#: hwclock/shhopt.c:398
-#, c-format
-msgid "unrecognized option `%s'\n"
-msgstr ""
-
-#: hwclock/shhopt.c:411 hwclock/shhopt.c:449
-#, c-format
-msgid "option `%s' requires an argument\n"
-msgstr ""
-
-#: hwclock/shhopt.c:417
-#, c-format
-msgid "option `%s' doesn't allow an argument\n"
-msgstr ""
-
-#: hwclock/shhopt.c:439
-#, c-format
-msgid "unrecognized option `-%c'\n"
-msgstr ""
-
#: login-utils/agetty.c:312
msgid "calling open_tty\n"
msgstr ""
@@ -6265,7 +6460,7 @@ msgstr ""
msgid "fork failed\n"
msgstr ""
-#: login-utils/simpleinit.c:512 text-utils/more.c:1705
+#: login-utils/simpleinit.c:512 text-utils/more.c:1706
msgid "exec failed\n"
msgstr ""
@@ -7025,310 +7220,314 @@ msgstr ""
msgid "; rest of file ignored"
msgstr ""
-#: mount/mount.c:379
+#: mount/mount.c:381
#, c-format
msgid "mount: according to mtab, %s is already mounted on %s"
msgstr ""
-#: mount/mount.c:383
+#: mount/mount.c:385
#, c-format
msgid "mount: according to mtab, %s is mounted on %s"
msgstr ""
-#: mount/mount.c:404
+#: mount/mount.c:406
#, c-format
msgid "mount: can't open %s for writing: %s"
msgstr ""
-#: mount/mount.c:419 mount/mount.c:638
+#: mount/mount.c:421 mount/mount.c:640
#, c-format
msgid "mount: error writing %s: %s"
msgstr ""
-#: mount/mount.c:426
+#: mount/mount.c:428
#, c-format
msgid "mount: error changing mode of %s: %s"
msgstr ""
-#: mount/mount.c:472
+#: mount/mount.c:474
#, c-format
msgid "%s looks like swapspace - not mounted"
msgstr ""
-#: mount/mount.c:532
+#: mount/mount.c:534
msgid "mount failed"
msgstr ""
-#: mount/mount.c:534
+#: mount/mount.c:536
#, c-format
msgid "mount: only root can mount %s on %s"
msgstr ""
-#: mount/mount.c:562
+#: mount/mount.c:564
msgid "mount: loop device specified twice"
msgstr ""
-#: mount/mount.c:567
+#: mount/mount.c:569
msgid "mount: type specified twice"
msgstr ""
-#: mount/mount.c:579
+#: mount/mount.c:581
msgid "mount: skipping the setup of a loop device\n"
msgstr ""
-#: mount/mount.c:588
+#: mount/mount.c:590
#, c-format
msgid "mount: going to use the loop device %s\n"
msgstr ""
-#: mount/mount.c:592
+#: mount/mount.c:594
msgid "mount: failed setting up loop device\n"
msgstr ""
-#: mount/mount.c:596
+#: mount/mount.c:598
msgid "mount: setup loop device successfully\n"
msgstr ""
-#: mount/mount.c:633
+#: mount/mount.c:635
#, c-format
msgid "mount: can't open %s: %s"
msgstr ""
-#: mount/mount.c:656
+#: mount/mount.c:658
#, fuzzy, c-format
msgid "mount: cannot open %s for setting speed"
msgstr "Kan schijf niet openen"
-#: mount/mount.c:659
+#: mount/mount.c:661
#, fuzzy, c-format
msgid "mount: cannot set speed: %s"
msgstr "Kan het bestand '%s' niet openen"
-#: mount/mount.c:720 mount/mount.c:1265
+#: mount/mount.c:722 mount/mount.c:1295
#, c-format
msgid "mount: cannot fork: %s"
msgstr ""
-#: mount/mount.c:800
+#: mount/mount.c:802
msgid "mount: this version was compiled without support for the type `nfs'"
msgstr ""
-#: mount/mount.c:839
+#: mount/mount.c:841
msgid "mount: failed with nfs mount version 4, trying 3..\n"
msgstr ""
-#: mount/mount.c:850
+#: mount/mount.c:852
msgid ""
"mount: I could not determine the filesystem type, and none was specified"
msgstr ""
-#: mount/mount.c:853
+#: mount/mount.c:855
msgid "mount: you must specify the filesystem type"
msgstr ""
#. should not happen
-#: mount/mount.c:856
+#: mount/mount.c:858
msgid "mount: mount failed"
msgstr ""
-#: mount/mount.c:862 mount/mount.c:897
+#: mount/mount.c:864 mount/mount.c:899
#, c-format
msgid "mount: mount point %s is not a directory"
msgstr ""
-#: mount/mount.c:864
+#: mount/mount.c:866
msgid "mount: permission denied"
msgstr ""
-#: mount/mount.c:866
+#: mount/mount.c:868
msgid "mount: must be superuser to use mount"
msgstr ""
#. heuristic: if /proc/version exists, then probably proc is mounted
#. proc mounted?
-#: mount/mount.c:870 mount/mount.c:874
+#: mount/mount.c:872 mount/mount.c:876
#, c-format
msgid "mount: %s is busy"
msgstr ""
#. no
#. yes, don't mention it
-#: mount/mount.c:876
+#: mount/mount.c:878
msgid "mount: proc already mounted"
msgstr ""
-#: mount/mount.c:878
+#: mount/mount.c:880
#, c-format
msgid "mount: %s already mounted or %s busy"
msgstr ""
-#: mount/mount.c:884
+#: mount/mount.c:886
#, c-format
msgid "mount: mount point %s does not exist"
msgstr ""
-#: mount/mount.c:886
+#: mount/mount.c:888
#, c-format
msgid "mount: mount point %s is a symbolic link to nowhere"
msgstr ""
-#: mount/mount.c:889
+#: mount/mount.c:891
#, c-format
msgid "mount: special device %s does not exist"
msgstr ""
-#: mount/mount.c:899
+#: mount/mount.c:901
#, c-format
msgid ""
"mount: special device %s does not exist\n"
" (a path prefix is not a directory)\n"
msgstr ""
-#: mount/mount.c:912
+#: mount/mount.c:914
#, c-format
msgid "mount: %s not mounted already, or bad option"
msgstr ""
-#: mount/mount.c:914
+#: mount/mount.c:916
#, c-format
msgid ""
"mount: wrong fs type, bad option, bad superblock on %s,\n"
" or too many mounted file systems"
msgstr ""
-#: mount/mount.c:948
+#: mount/mount.c:950
msgid "mount table full"
msgstr ""
-#: mount/mount.c:950
+#: mount/mount.c:952
#, c-format
msgid "mount: %s: can't read superblock"
msgstr ""
-#: mount/mount.c:954
+#: mount/mount.c:956
#, c-format
msgid "mount: %s: unknown device"
msgstr ""
-#: mount/mount.c:959
+#: mount/mount.c:961
#, c-format
msgid "mount: fs type %s not supported by kernel"
msgstr ""
-#: mount/mount.c:971
+#: mount/mount.c:973
#, c-format
msgid "mount: probably you meant %s"
msgstr ""
-#: mount/mount.c:973
+#: mount/mount.c:975
msgid "mount: maybe you meant iso9660 ?"
msgstr ""
-#: mount/mount.c:976
+#: mount/mount.c:978
#, c-format
msgid "mount: %s has wrong device number or fs type %s not supported"
msgstr ""
#. strange ...
-#: mount/mount.c:982
+#: mount/mount.c:984
#, c-format
msgid "mount: %s is not a block device, and stat fails?"
msgstr ""
-#: mount/mount.c:984
+#: mount/mount.c:986
#, c-format
msgid ""
"mount: the kernel does not recognize %s as a block device\n"
" (maybe `insmod driver'?)"
msgstr ""
-#: mount/mount.c:987
+#: mount/mount.c:989
#, c-format
msgid "mount: %s is not a block device (maybe try `-o loop'?)"
msgstr ""
-#: mount/mount.c:990
+#: mount/mount.c:992
#, c-format
msgid "mount: %s is not a block device"
msgstr ""
-#: mount/mount.c:993
+#: mount/mount.c:995
#, c-format
msgid "mount: %s is not a valid block device"
msgstr ""
#. pre-linux 1.1.38, 1.1.41 and later
#. linux 1.1.38 and later
-#: mount/mount.c:996
+#: mount/mount.c:998
msgid "block device "
msgstr ""
-#: mount/mount.c:998
+#: mount/mount.c:1000
#, c-format
msgid "mount: cannot mount %s%s read-only"
msgstr ""
-#: mount/mount.c:1002
+#: mount/mount.c:1004
#, c-format
msgid "mount: %s%s is write-protected but explicit `-w' flag given"
msgstr ""
-#: mount/mount.c:1018
+#: mount/mount.c:1020
#, c-format
msgid "mount: %s%s is write-protected, mounting read-only"
msgstr ""
-#: mount/mount.c:1104
+#: mount/mount.c:1107
#, c-format
msgid "mount: the label %s occurs on both %s and %s\n"
msgstr ""
-#: mount/mount.c:1108
+#: mount/mount.c:1111
#, c-format
msgid "mount: %s duplicate - not mounted"
msgstr ""
-#: mount/mount.c:1118
+#: mount/mount.c:1121
#, c-format
msgid "mount: going to mount %s by %s\n"
msgstr ""
-#: mount/mount.c:1119
+#: mount/mount.c:1122
msgid "UUID"
msgstr ""
-#: mount/mount.c:1119
+#: mount/mount.c:1122
#, fuzzy
msgid "label"
msgstr "Tabel"
-#: mount/mount.c:1121 mount/mount.c:1521
+#: mount/mount.c:1124 mount/mount.c:1555
msgid "mount: no such partition found"
msgstr ""
-#: mount/mount.c:1129
+#: mount/mount.c:1132
msgid "mount: no type was given - I'll assume nfs because of the colon\n"
msgstr ""
+#: mount/mount.c:1137
+msgid "mount: no type was given - I'll assume smb because of the // prefix\n"
+msgstr ""
+
#.
#. * Retry in the background.
#.
-#: mount/mount.c:1145
+#: mount/mount.c:1153
#, c-format
msgid "mount: backgrounding \"%s\"\n"
msgstr ""
-#: mount/mount.c:1156
+#: mount/mount.c:1164
#, c-format
msgid "mount: giving up \"%s\"\n"
msgstr ""
-#: mount/mount.c:1216
+#: mount/mount.c:1240
#, c-format
msgid "mount: %s already mounted on %s\n"
msgstr ""
-#: mount/mount.c:1335
+#: mount/mount.c:1369
msgid ""
"Usage: mount -V : print version\n"
" mount -h : print this help\n"
@@ -7353,73 +7552,73 @@ msgid ""
"For many more details, say man 8 mount .\n"
msgstr ""
-#: mount/mount.c:1497
+#: mount/mount.c:1531
msgid "mount: only root can do that"
msgstr ""
-#: mount/mount.c:1502
+#: mount/mount.c:1536
#, c-format
msgid "mount: no %s found - creating it..\n"
msgstr ""
-#: mount/mount.c:1516
+#: mount/mount.c:1550
#, c-format
msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
msgstr ""
-#: mount/mount.c:1523
+#: mount/mount.c:1557
#, c-format
msgid "mount: mounting %s\n"
msgstr ""
-#: mount/mount.c:1532
+#: mount/mount.c:1566
msgid "nothing was mounted"
msgstr ""
-#: mount/mount.c:1547
+#: mount/mount.c:1581
#, c-format
msgid "mount: cannot find %s in %s"
msgstr ""
-#: mount/mount.c:1562
+#: mount/mount.c:1596
#, c-format
msgid "mount: can't find %s in %s or %s"
msgstr ""
-#: mount/mount_by_label.c:169
+#: mount/mount_by_label.c:199
#, c-format
msgid ""
"mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
msgstr ""
-#: mount/mount_by_label.c:295
+#: mount/mount_by_label.c:325
msgid "mount: bad UUID"
msgstr ""
-#: mount/mount_guess_fstype.c:487
+#: mount/mount_guess_fstype.c:482
msgid "mount: error while guessing filesystem type\n"
msgstr ""
-#: mount/mount_guess_fstype.c:496
+#: mount/mount_guess_fstype.c:491
#, c-format
msgid "mount: you didn't specify a filesystem type for %s\n"
msgstr ""
-#: mount/mount_guess_fstype.c:499
+#: mount/mount_guess_fstype.c:494
#, c-format
msgid " I will try all types mentioned in %s or %s\n"
msgstr ""
-#: mount/mount_guess_fstype.c:502
+#: mount/mount_guess_fstype.c:497
msgid " and it looks like this is swapspace\n"
msgstr ""
-#: mount/mount_guess_fstype.c:504
+#: mount/mount_guess_fstype.c:499
#, c-format
msgid " I will try type %s\n"
msgstr ""
-#: mount/mount_guess_fstype.c:592
+#: mount/mount_guess_fstype.c:587
#, c-format
msgid "Trying %s\n"
msgstr ""
@@ -7513,7 +7712,7 @@ msgstr ""
msgid "bug in xstrndup call"
msgstr ""
-#: mount/swapon.c:51
+#: mount/swapon.c:56
#, c-format
msgid ""
"usage: %s [-hV]\n"
@@ -7522,27 +7721,39 @@ msgid ""
" %s [-s]\n"
msgstr ""
-#: mount/swapon.c:88
+#: mount/swapon.c:66
+#, c-format
+msgid ""
+"usage: %s [-hV]\n"
+" %s -a [-v]\n"
+" %s [-v] special ...\n"
+msgstr ""
+
+#: mount/swapon.c:170 mount/swapon.c:234
#, c-format
msgid "%s on %s\n"
msgstr ""
-#: mount/swapon.c:93
+#: mount/swapon.c:174
#, c-format
msgid "swapon: cannot stat %s: %s\n"
msgstr ""
-#: mount/swapon.c:105
+#: mount/swapon.c:185
#, c-format
msgid "swapon: warning: %s has insecure permissions %04o, %04o suggested\n"
msgstr ""
-#: mount/swapon.c:115
+#: mount/swapon.c:197
#, c-format
msgid "swapon: Skipping file %s - it appears to have holes.\n"
msgstr ""
-#: mount/swapon.c:222
+#: mount/swapon.c:240
+msgid "Not superuser.\n"
+msgstr ""
+
+#: mount/swapon.c:298 mount/swapon.c:386
#, fuzzy, c-format
msgid "%s: cannot open %s: %s\n"
msgstr "Kan het bestand '%s' niet openen"
@@ -7895,41 +8106,41 @@ msgstr "mkfs versie "
msgid "%s: unknown argument: %s\n"
msgstr "Kan het bestand '%s' niet openen"
-#: sys-utils/ipcs.c:122
+#: sys-utils/ipcs.c:121
#, c-format
msgid "usage : %s -asmq -tclup \n"
msgstr ""
-#: sys-utils/ipcs.c:123
+#: sys-utils/ipcs.c:122
#, c-format
msgid "\t%s [-s -m -q] -i id\n"
msgstr ""
-#: sys-utils/ipcs.c:124
+#: sys-utils/ipcs.c:123
#, c-format
msgid "\t%s -h for help.\n"
msgstr ""
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:129
#, c-format
msgid ""
"%s provides information on ipc facilities for which you have read access.\n"
msgstr ""
-#: sys-utils/ipcs.c:132
+#: sys-utils/ipcs.c:131
msgid ""
"Resource Specification:\n"
"\t-m : shared_mem\n"
"\t-q : messages\n"
msgstr ""
-#: sys-utils/ipcs.c:133
+#: sys-utils/ipcs.c:132
msgid ""
"\t-s : semaphores\n"
"\t-a : all (default)\n"
msgstr ""
-#: sys-utils/ipcs.c:134
+#: sys-utils/ipcs.c:133
msgid ""
"Output Format:\n"
"\t-t : time\n"
@@ -7937,500 +8148,495 @@ msgid ""
"\t-c : creator\n"
msgstr ""
-#: sys-utils/ipcs.c:135
+#: sys-utils/ipcs.c:134
msgid ""
"\t-l : limits\n"
"\t-u : summary\n"
msgstr ""
-#: sys-utils/ipcs.c:136
+#: sys-utils/ipcs.c:135
msgid "-i id [-s -q -m] : details on resource identified by id\n"
msgstr ""
-#: sys-utils/ipcs.c:268
+#: sys-utils/ipcs.c:267
msgid "kernel not configured for shared memory\n"
msgstr ""
-#: sys-utils/ipcs.c:274
+#: sys-utils/ipcs.c:273
msgid "------ Shared Memory Limits --------\n"
msgstr ""
#. glibc 2.1.3 and all earlier libc's have ints as fields
#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
-#: sys-utils/ipcs.c:279
+#: sys-utils/ipcs.c:278
#, c-format
msgid "max number of segments = %ld\n"
msgstr ""
-#: sys-utils/ipcs.c:281
+#: sys-utils/ipcs.c:280
#, c-format
msgid "max seg size (kbytes) = %ld\n"
msgstr ""
-#: sys-utils/ipcs.c:283
+#: sys-utils/ipcs.c:282
#, c-format
msgid "max total shared memory (kbytes) = %ld\n"
msgstr ""
-#: sys-utils/ipcs.c:285
+#: sys-utils/ipcs.c:284
#, c-format
msgid "min seg size (bytes) = %ld\n"
msgstr ""
-#: sys-utils/ipcs.c:290
+#: sys-utils/ipcs.c:289
msgid "------ Shared Memory Status --------\n"
msgstr ""
-#: sys-utils/ipcs.c:291
+#: sys-utils/ipcs.c:290
#, c-format
msgid "segments allocated %d\n"
msgstr ""
-#: sys-utils/ipcs.c:292
+#: sys-utils/ipcs.c:291
#, c-format
msgid "pages allocated %ld\n"
msgstr ""
-#: sys-utils/ipcs.c:293
+#: sys-utils/ipcs.c:292
#, c-format
msgid "pages resident %ld\n"
msgstr ""
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:293
#, c-format
msgid "pages swapped %ld\n"
msgstr ""
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:294
#, c-format
msgid "Swap performance: %ld attempts\t %ld successes\n"
msgstr ""
-#: sys-utils/ipcs.c:300
+#: sys-utils/ipcs.c:299
msgid "------ Shared Memory Segment Creators/Owners --------\n"
msgstr ""
-#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:300 sys-utils/ipcs.c:417 sys-utils/ipcs.c:516
#, c-format
msgid "%-10s %-10s %-10s %-10s %-10s %-10s\n"
msgstr ""
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:308 sys-utils/ipcs.c:315
-#: sys-utils/ipcs.c:321 sys-utils/ipcs.c:425
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:307 sys-utils/ipcs.c:314
+#: sys-utils/ipcs.c:320 sys-utils/ipcs.c:424
msgid "shmid"
msgstr ""
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:321 sys-utils/ipcs.c:419
-#: sys-utils/ipcs.c:434 sys-utils/ipcs.c:519 sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:320 sys-utils/ipcs.c:418
+#: sys-utils/ipcs.c:433 sys-utils/ipcs.c:517 sys-utils/ipcs.c:535
msgid "perms"
msgstr ""
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:517
msgid "cuid"
msgstr ""
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:517
msgid "cgid"
msgstr ""
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:517
msgid "uid"
msgstr ""
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:517
msgid "gid"
msgstr ""
-#: sys-utils/ipcs.c:306
+#: sys-utils/ipcs.c:305
msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
msgstr ""
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:306
#, c-format
msgid "%-10s %-10s %-20s %-20s %-20s\n"
msgstr ""
-#: sys-utils/ipcs.c:308 sys-utils/ipcs.c:315 sys-utils/ipcs.c:321
-#: sys-utils/ipcs.c:425 sys-utils/ipcs.c:434 sys-utils/ipcs.c:525
-#: sys-utils/ipcs.c:531 sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:314 sys-utils/ipcs.c:320
+#: sys-utils/ipcs.c:424 sys-utils/ipcs.c:433 sys-utils/ipcs.c:523
+#: sys-utils/ipcs.c:529 sys-utils/ipcs.c:535
msgid "owner"
msgstr ""
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:307
msgid "attached"
msgstr ""
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:307
msgid "detached"
msgstr ""
-#: sys-utils/ipcs.c:309
+#: sys-utils/ipcs.c:308
msgid "changed"
msgstr ""
-#: sys-utils/ipcs.c:313
+#: sys-utils/ipcs.c:312
msgid "------ Shared Memory Creator/Last-op --------\n"
msgstr ""
-#: sys-utils/ipcs.c:314 sys-utils/ipcs.c:530
+#: sys-utils/ipcs.c:313 sys-utils/ipcs.c:528
#, c-format
msgid "%-10s %-10s %-10s %-10s\n"
msgstr ""
-#: sys-utils/ipcs.c:315
+#: sys-utils/ipcs.c:314
msgid "cpid"
msgstr ""
-#: sys-utils/ipcs.c:315
+#: sys-utils/ipcs.c:314
msgid "lpid"
msgstr ""
-#: sys-utils/ipcs.c:319
+#: sys-utils/ipcs.c:318
msgid "------ Shared Memory Segments --------\n"
msgstr ""
-#: sys-utils/ipcs.c:320
+#: sys-utils/ipcs.c:319
#, c-format
msgid "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n"
msgstr ""
-#: sys-utils/ipcs.c:321 sys-utils/ipcs.c:434 sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:320 sys-utils/ipcs.c:433 sys-utils/ipcs.c:535
msgid "key"
msgstr ""
-#: sys-utils/ipcs.c:321
+#: sys-utils/ipcs.c:320
msgid "bytes"
msgstr ""
-#: sys-utils/ipcs.c:322
+#: sys-utils/ipcs.c:321
msgid "nattch"
msgstr ""
-#: sys-utils/ipcs.c:322 sys-utils/ipcs.c:435
+#: sys-utils/ipcs.c:321
msgid "status"
msgstr ""
-#: sys-utils/ipcs.c:343 sys-utils/ipcs.c:345 sys-utils/ipcs.c:347
-#: sys-utils/ipcs.c:456 sys-utils/ipcs.c:458 sys-utils/ipcs.c:558
-#: sys-utils/ipcs.c:560 sys-utils/ipcs.c:562 sys-utils/ipcs.c:615
-#: sys-utils/ipcs.c:617 sys-utils/ipcs.c:646 sys-utils/ipcs.c:648
-#: sys-utils/ipcs.c:650 sys-utils/ipcs.c:674
+#: sys-utils/ipcs.c:342 sys-utils/ipcs.c:344 sys-utils/ipcs.c:346
+#: sys-utils/ipcs.c:455 sys-utils/ipcs.c:457 sys-utils/ipcs.c:556
+#: sys-utils/ipcs.c:558 sys-utils/ipcs.c:560 sys-utils/ipcs.c:613
+#: sys-utils/ipcs.c:615 sys-utils/ipcs.c:644 sys-utils/ipcs.c:646
+#: sys-utils/ipcs.c:648 sys-utils/ipcs.c:672
msgid "Not set"
msgstr ""
-#: sys-utils/ipcs.c:372
+#: sys-utils/ipcs.c:371
msgid "dest"
msgstr ""
-#: sys-utils/ipcs.c:373
+#: sys-utils/ipcs.c:372
msgid "locked"
msgstr ""
-#: sys-utils/ipcs.c:393
+#: sys-utils/ipcs.c:392
msgid "kernel not configured for semaphores\n"
msgstr ""
-#: sys-utils/ipcs.c:399
+#: sys-utils/ipcs.c:398
msgid "------ Semaphore Limits --------\n"
msgstr ""
-#: sys-utils/ipcs.c:403
+#: sys-utils/ipcs.c:402
#, c-format
msgid "max number of arrays = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:404
+#: sys-utils/ipcs.c:403
#, c-format
msgid "max semaphores per array = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:405
+#: sys-utils/ipcs.c:404
#, c-format
msgid "max semaphores system wide = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:405
#, c-format
msgid "max ops per semop call = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:407
+#: sys-utils/ipcs.c:406
#, c-format
msgid "semaphore max value = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:411
+#: sys-utils/ipcs.c:410
msgid "------ Semaphore Status --------\n"
msgstr ""
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:411
#, c-format
msgid "used arrays = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:413
+#: sys-utils/ipcs.c:412
#, c-format
msgid "allocated semaphores = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:417
+#: sys-utils/ipcs.c:416
msgid "------ Semaphore Arrays Creators/Owners --------\n"
msgstr ""
-#: sys-utils/ipcs.c:419 sys-utils/ipcs.c:434
+#: sys-utils/ipcs.c:418 sys-utils/ipcs.c:433
msgid "semid"
msgstr ""
-#: sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:422
msgid "------ Shared Memory Operation/Change Times --------\n"
msgstr ""
-#: sys-utils/ipcs.c:424
+#: sys-utils/ipcs.c:423
#, c-format
msgid "%-8s %-10s %-26.24s %-26.24s\n"
msgstr ""
-#: sys-utils/ipcs.c:425
+#: sys-utils/ipcs.c:424
msgid "last-op"
msgstr ""
-#: sys-utils/ipcs.c:425
+#: sys-utils/ipcs.c:424
msgid "last-changed"
msgstr ""
-#: sys-utils/ipcs.c:432
+#: sys-utils/ipcs.c:431
msgid "------ Semaphore Arrays --------\n"
msgstr ""
-#: sys-utils/ipcs.c:433
+#: sys-utils/ipcs.c:432 sys-utils/ipcs.c:675
#, c-format
-msgid "%-10s %-10s %-10s %-10s %-10s %-12s\n"
+msgid "%-10s %-10s %-10s %-10s %-10s\n"
msgstr ""
-#: sys-utils/ipcs.c:435
+#: sys-utils/ipcs.c:434
msgid "nsems"
msgstr ""
-#: sys-utils/ipcs.c:495
+#: sys-utils/ipcs.c:493
msgid "kernel not configured for message queues\n"
msgstr ""
-#: sys-utils/ipcs.c:503
+#: sys-utils/ipcs.c:501
msgid "------ Messages: Limits --------\n"
msgstr ""
-#: sys-utils/ipcs.c:504
+#: sys-utils/ipcs.c:502
#, c-format
msgid "max queues system wide = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:503
#, c-format
msgid "max size of message (bytes) = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:504
#, c-format
msgid "default max size of queue (bytes) = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:508
msgid "------ Messages: Status --------\n"
msgstr ""
-#: sys-utils/ipcs.c:511
+#: sys-utils/ipcs.c:509
#, c-format
msgid "allocated queues = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:510
#, c-format
msgid "used headers = %d\n"
msgstr ""
-#: sys-utils/ipcs.c:513
+#: sys-utils/ipcs.c:511
#, c-format
msgid "used space = %d bytes\n"
msgstr ""
-#: sys-utils/ipcs.c:517
+#: sys-utils/ipcs.c:515
msgid "------ Message Queues: Creators/Owners --------\n"
msgstr ""
-#: sys-utils/ipcs.c:519 sys-utils/ipcs.c:525 sys-utils/ipcs.c:531
-#: sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:517 sys-utils/ipcs.c:523 sys-utils/ipcs.c:529
+#: sys-utils/ipcs.c:535
msgid "msqid"
msgstr ""
-#: sys-utils/ipcs.c:523
+#: sys-utils/ipcs.c:521
msgid "------ Message Queues Send/Recv/Change Times --------\n"
msgstr ""
-#: sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:522
#, c-format
msgid "%-8s %-10s %-20s %-20s %-20s\n"
msgstr ""
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:523
msgid "send"
msgstr ""
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:523
msgid "recv"
msgstr ""
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:523
msgid "change"
msgstr ""
-#: sys-utils/ipcs.c:529
+#: sys-utils/ipcs.c:527
msgid "------ Message Queues PIDs --------\n"
msgstr ""
-#: sys-utils/ipcs.c:531
+#: sys-utils/ipcs.c:529
msgid "lspid"
msgstr ""
-#: sys-utils/ipcs.c:531
+#: sys-utils/ipcs.c:529
msgid "lrpid"
msgstr ""
-#: sys-utils/ipcs.c:535
+#: sys-utils/ipcs.c:533
msgid "------ Message Queues --------\n"
msgstr ""
-#: sys-utils/ipcs.c:536
+#: sys-utils/ipcs.c:534
#, c-format
msgid "%-10s %-10s %-10s %-10s %-12s %-12s\n"
msgstr ""
-#: sys-utils/ipcs.c:538
+#: sys-utils/ipcs.c:536
msgid "used-bytes"
msgstr ""
-#: sys-utils/ipcs.c:538
+#: sys-utils/ipcs.c:536
msgid "messages"
msgstr ""
-#: sys-utils/ipcs.c:606
+#: sys-utils/ipcs.c:604
#, c-format
msgid ""
"\n"
"Shared memory Segment shmid=%d\n"
msgstr ""
-#: sys-utils/ipcs.c:607
+#: sys-utils/ipcs.c:605
#, c-format
msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
msgstr ""
-#: sys-utils/ipcs.c:609
+#: sys-utils/ipcs.c:607
#, c-format
msgid "mode=%#o\taccess_perms=%#o\n"
msgstr ""
-#: sys-utils/ipcs.c:611
+#: sys-utils/ipcs.c:609
#, c-format
msgid "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n"
msgstr ""
-#: sys-utils/ipcs.c:614
+#: sys-utils/ipcs.c:612
#, c-format
msgid "att_time=%-26.24s\n"
msgstr ""
-#: sys-utils/ipcs.c:616
+#: sys-utils/ipcs.c:614
#, c-format
msgid "det_time=%-26.24s\n"
msgstr ""
-#: sys-utils/ipcs.c:618 sys-utils/ipcs.c:649
+#: sys-utils/ipcs.c:616 sys-utils/ipcs.c:647
#, c-format
msgid "change_time=%-26.24s\n"
msgstr ""
-#: sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:631
#, c-format
msgid ""
"\n"
"Message Queue msqid=%d\n"
msgstr ""
-#: sys-utils/ipcs.c:634
+#: sys-utils/ipcs.c:632
#, c-format
msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
msgstr ""
-#: sys-utils/ipcs.c:636
+#: sys-utils/ipcs.c:634
#, c-format
msgid "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
msgstr ""
-#: sys-utils/ipcs.c:645
+#: sys-utils/ipcs.c:643
#, c-format
msgid "send_time=%-26.24s\n"
msgstr ""
-#: sys-utils/ipcs.c:647
+#: sys-utils/ipcs.c:645
#, c-format
msgid "rcv_time=%-26.24s\n"
msgstr ""
-#: sys-utils/ipcs.c:667
+#: sys-utils/ipcs.c:665
#, c-format
msgid ""
"\n"
"Semaphore Array semid=%d\n"
msgstr ""
-#: sys-utils/ipcs.c:668
+#: sys-utils/ipcs.c:666
#, c-format
msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
msgstr ""
-#: sys-utils/ipcs.c:670
+#: sys-utils/ipcs.c:668
#, c-format
msgid "mode=%#o, access_perms=%#o\n"
msgstr ""
-#: sys-utils/ipcs.c:672
+#: sys-utils/ipcs.c:670
#, c-format
msgid "nsems = %ld\n"
msgstr ""
-#: sys-utils/ipcs.c:673
+#: sys-utils/ipcs.c:671
#, c-format
msgid "otime = %-26.24s\n"
msgstr ""
-#: sys-utils/ipcs.c:675
+#: sys-utils/ipcs.c:673
#, c-format
msgid "ctime = %-26.24s\n"
msgstr ""
-#: sys-utils/ipcs.c:677
-#, c-format
-msgid "%-10s %-10s %-10s %-10s %-10s\n"
-msgstr ""
-
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "semnum"
msgstr ""
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
#, fuzzy
msgid "value"
msgstr "Tabel"
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "ncount"
msgstr ""
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "zcount"
msgstr ""
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "pid"
msgstr ""
@@ -8663,11 +8869,11 @@ msgstr ""
msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
msgstr ""
-#: text-utils/column.c:298
+#: text-utils/column.c:297
msgid "line too long"
msgstr ""
-#: text-utils/column.c:375
+#: text-utils/column.c:374
msgid "usage: column [-tx] [-c columns] [file ...]\n"
msgstr ""
@@ -8750,65 +8956,65 @@ msgstr ""
msgid "Can't open help file"
msgstr "Kan het bestand '%s' niet openen"
-#: text-utils/more.c:1442 text-utils/more.c:1446
+#: text-utils/more.c:1442 text-utils/more.c:1447
msgid "[Press 'h' for instructions.]"
msgstr ""
-#: text-utils/more.c:1480
+#: text-utils/more.c:1481
#, c-format
msgid "\"%s\" line %d"
msgstr ""
-#: text-utils/more.c:1482
+#: text-utils/more.c:1483
#, c-format
msgid "[Not a file] line %d"
msgstr ""
-#: text-utils/more.c:1566
+#: text-utils/more.c:1567
msgid " Overflow\n"
msgstr ""
-#: text-utils/more.c:1613
+#: text-utils/more.c:1614
msgid "...skipping\n"
msgstr ""
-#: text-utils/more.c:1643
+#: text-utils/more.c:1644
msgid "Regular expression botch"
msgstr ""
-#: text-utils/more.c:1655
+#: text-utils/more.c:1656
msgid ""
"\n"
"Pattern not found\n"
msgstr ""
-#: text-utils/more.c:1658
+#: text-utils/more.c:1659 text-utils/pg.c:1134 text-utils/pg.c:1285
msgid "Pattern not found"
msgstr ""
-#: text-utils/more.c:1719
+#: text-utils/more.c:1720
msgid "can't fork\n"
msgstr ""
-#: text-utils/more.c:1758
+#: text-utils/more.c:1759
msgid ""
"\n"
"...Skipping "
msgstr ""
-#: text-utils/more.c:1763
+#: text-utils/more.c:1764
msgid "...Skipping to file "
msgstr ""
-#: text-utils/more.c:1765
+#: text-utils/more.c:1766
msgid "...Skipping back to file "
msgstr ""
-#: text-utils/more.c:2046
+#: text-utils/more.c:2047
msgid "Line too long"
msgstr ""
-#: text-utils/more.c:2089
+#: text-utils/more.c:2090
msgid "No previous command to substitute for"
msgstr ""
@@ -8858,6 +9064,95 @@ msgstr ""
msgid "hexdump: bad conversion character %%%s.\n"
msgstr ""
+#: text-utils/pg.c:246
+#, c-format
+msgid ""
+"%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
+msgstr ""
+
+#: text-utils/pg.c:255
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- %s\n"
+msgstr "Kan het bestand '%s' niet openen"
+
+#: text-utils/pg.c:263
+#, fuzzy, c-format
+msgid "%s: illegal option -- %s\n"
+msgstr "Niet herkende toets"
+
+#: text-utils/pg.c:380
+msgid "...skipping forward\n"
+msgstr ""
+
+#: text-utils/pg.c:382
+msgid "...skipping backward\n"
+msgstr ""
+
+#: text-utils/pg.c:404
+msgid "No next file"
+msgstr ""
+
+#: text-utils/pg.c:408
+#, fuzzy
+msgid "No previous file"
+msgstr "Maak geen partitie"
+
+#: text-utils/pg.c:938
+#, fuzzy, c-format
+msgid "%s: Read error from %s file\n"
+msgstr "Kan het bestand '%s' niet openen"
+
+#.
+#. * Most likely '\0' in input.
+#.
+#: text-utils/pg.c:944
+#, c-format
+msgid "%s: Unexpected EOF in %s file\n"
+msgstr ""
+
+#: text-utils/pg.c:947
+#, fuzzy, c-format
+msgid "%s: Unknown error in %s file\n"
+msgstr "Kan het bestand '%s' niet openen"
+
+#: text-utils/pg.c:1042
+#, fuzzy, c-format
+msgid "%s: Cannot create tempfile\n"
+msgstr "Kan het bestand '%s' niet openen"
+
+#: text-utils/pg.c:1051 text-utils/pg.c:1226
+msgid "RE error: "
+msgstr ""
+
+#: text-utils/pg.c:1208
+msgid "(EOF)"
+msgstr ""
+
+#: text-utils/pg.c:1234
+msgid "No remembered search string"
+msgstr ""
+
+#: text-utils/pg.c:1317
+#, fuzzy
+msgid "Cannot open "
+msgstr "Kan het bestand '%s' niet openen"
+
+#: text-utils/pg.c:1365
+msgid "saved"
+msgstr ""
+
+#: text-utils/pg.c:1472
+msgid ": !command not allowed in rflag mode.\n"
+msgstr ""
+
+#: text-utils/pg.c:1504
+msgid "fork() failed, try again later\n"
+msgstr ""
+
+#: text-utils/pg.c:1709
+msgid "(Next file: "
+msgstr ""
+
#: text-utils/rev.c:113
msgid "Unable to allocate bufferspace\n"
msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8255156bb..9bcdf72be 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,7 +13,7 @@
msgid ""
msgstr ""
"Project-Id-Version: util-linux 2.11b\n"
-"POT-Creation-Date: 2002-05-09 02:51+0200\n"
+"POT-Creation-Date: 2002-07-07 17:03+0200\n"
"PO-Revision-Date: 2001-05-24 16:03-03:00\n"
"Last-Translator: Rodrigo Stulzer Lopes <rodrigo@conectiva.com.br>\n"
"Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -120,28 +120,28 @@ msgstr ""
msgid "usage:\n"
msgstr "Uso:\n"
-#: disk-utils/fdformat.c:35
+#: disk-utils/fdformat.c:31
msgid "Formatting ... "
msgstr "Formatando..."
-#: disk-utils/fdformat.c:53 disk-utils/fdformat.c:88
+#: disk-utils/fdformat.c:49 disk-utils/fdformat.c:84
msgid "done\n"
msgstr "concluído\n"
-#: disk-utils/fdformat.c:64
+#: disk-utils/fdformat.c:60
msgid "Verifying ... "
msgstr "Verificando..."
-#: disk-utils/fdformat.c:75
+#: disk-utils/fdformat.c:71
msgid "Read: "
msgstr "Ler: "
-#: disk-utils/fdformat.c:77
+#: disk-utils/fdformat.c:73
#, c-format
msgid "Problem reading cylinder %d, expected %d, read %d\n"
msgstr "Problema ao ler o cilindro %d: esperado %d, lido %d\n"
-#: disk-utils/fdformat.c:83
+#: disk-utils/fdformat.c:79
#, c-format
msgid ""
"bad data in cyl %d\n"
@@ -150,42 +150,148 @@ msgstr ""
"Dados inválidos no cilindro %d\n"
"Continuando..."
-#: disk-utils/fdformat.c:98
+#: disk-utils/fdformat.c:94
#, c-format
msgid "usage: %s [ -n ] device\n"
msgstr "Uso: %s [ -n ] dispositivo\n"
-#: disk-utils/fdformat.c:120 disk-utils/fsck.minix.c:1291
+#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1291
#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:55
-#: disk-utils/mkfs.minix.c:644 disk-utils/mkswap.c:457
-#: disk-utils/setfdprm.c:128 misc-utils/cal.c:246 misc-utils/ddate.c:181
-#: misc-utils/kill.c:188 misc-utils/rename.c:79 misc-utils/script.c:132
+#: disk-utils/mkfs.cramfs.c:665 disk-utils/mkfs.minix.c:644
+#: disk-utils/mkswap.c:457 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1170
+#: misc-utils/cal.c:246 misc-utils/ddate.c:181 misc-utils/kill.c:188
+#: misc-utils/rename.c:79 misc-utils/script.c:132
#, c-format
msgid "%s from %s\n"
msgstr "%s de %s\n"
-#: disk-utils/fdformat.c:134
-#, c-format
-msgid "%s: not a floppy device\n"
+#: disk-utils/fdformat.c:130
+#, fuzzy, c-format
+msgid "%s: not a block device\n"
msgstr "%s: não é um dispositivo de disquetes\n"
-#: disk-utils/fdformat.c:143
+#: disk-utils/fdformat.c:140
msgid "Could not determine current format type"
msgstr "Não foi possível determinar o tipo de formatação atual"
-#: disk-utils/fdformat.c:144
+#: disk-utils/fdformat.c:141
#, c-format
msgid "%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n"
msgstr "%s faces, %d trilhas, %d setores/trilha. Capacidade total de %d Kb.\n"
-#: disk-utils/fdformat.c:145
+#: disk-utils/fdformat.c:142
msgid "Double"
msgstr "Dupla"
-#: disk-utils/fdformat.c:145
+#: disk-utils/fdformat.c:142
msgid "Single"
msgstr "Simples"
+#: disk-utils/fsck.cramfs.c:98
+#, c-format
+msgid ""
+"usage: %s [-hv] [-x dir] file\n"
+" -h print this help\n"
+" -x dir extract into dir\n"
+" -v be more verbose\n"
+" file file to test\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:191
+#, c-format
+msgid "%s: error %d while decompressing! %p(%d)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:243
+#, fuzzy, c-format
+msgid "%s: size error in symlink `%s'\n"
+msgstr "%s: erro de procura em %s\n"
+
+#: disk-utils/fsck.cramfs.c:258 disk-utils/fsck.cramfs.c:328
+#, c-format
+msgid " uncompressing block at %ld to %ld (%ld)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:287
+#, c-format
+msgid "%s: bogus mode on `%s' (%o)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:319
+#, fuzzy, c-format
+msgid " hole at %ld (%d)\n"
+msgstr "deveria ser (%d, %d, %d)\n"
+
+#: disk-utils/fsck.cramfs.c:337
+#, c-format
+msgid "%s: Non-block (%ld) bytes\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:343
+#, c-format
+msgid "%s: Non-size (%ld vs %ld) bytes\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:392
+#, c-format
+msgid "%s: invalid cramfs--bad path length\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:472
+#, fuzzy, c-format
+msgid "%s: compiled without -x support\n"
+msgstr "%s: não compilado com suporte a minix v2\n"
+
+#: disk-utils/fsck.cramfs.c:498
+#, c-format
+msgid "%s: warning--unable to determine filesystem size \n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:508
+#, fuzzy, c-format
+msgid "%s is not a block device or file\n"
+msgstr "%s: não é um dispositivo de disquetes\n"
+
+#: disk-utils/fsck.cramfs.c:514 disk-utils/fsck.cramfs.c:549
+#, c-format
+msgid "%s: invalid cramfs--file length too short\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:541
+#, c-format
+msgid "%s: invalid cramfs--wrong magic\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:554
+#, c-format
+msgid "%s: warning--file length too long, padded image?\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:564
+#, fuzzy, c-format
+msgid "%s: invalid cramfs--crc error\n"
+msgstr "%s: opção erro de parser\n"
+
+#: disk-utils/fsck.cramfs.c:570
+#, c-format
+msgid "%s: warning--old cramfs image, no CRC\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:592
+#, c-format
+msgid "%s: invalid cramfs--bad superblock\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:608
+#, c-format
+msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:616
+#, c-format
+msgid "%s: invalid cramfs--invalid file data offset\n"
+msgstr ""
+
#: disk-utils/fsck.minix.c:200
#, c-format
msgid "Usage: %s [-larvsmf] /dev/name\n"
@@ -654,7 +760,7 @@ msgstr "muitos inodes - máximo é 512"
msgid "not enough space, need at least %lu blocks"
msgstr "pouco espaço, é necessário pelo menos %lu blocos"
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2057
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2069
#, c-format
msgid "Device: %s\n"
msgstr "Dispositivo: %s\n"
@@ -739,6 +845,130 @@ msgstr "%s: memória insuficiente!\n"
msgid "mkfs version %s (%s)\n"
msgstr "mkfs versão %s (%s)\n"
+#: disk-utils/mkfs.cramfs.c:49
+#, c-format
+msgid ""
+"usage: %s [-h] [-v] [-e edition] [-i file] [-n name] dirname outfile\n"
+" -h print this help\n"
+" -v be verbose\n"
+" -E make all warnings errors (non-zero exit status)\n"
+" -e edition set edition number (part of fsid)\n"
+" -i file insert a file image into the filesystem (requires >= 2.4.0)\n"
+" -n name set name of cramfs filesystem\n"
+" -p pad by %d bytes for boot code\n"
+" -s sort directory entries (old option, ignored)\n"
+" -z make explicit holes (requires >= 2.3.39)\n"
+" dirname root of the filesystem to be compressed\n"
+" outfile output file\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:213
+#, c-format
+msgid ""
+"Very long (%u bytes) filename `%s' found.\n"
+" Please increase MAX_INPUT_NAMELEN in mkcramfs.c and recompile. Exiting.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:371
+msgid "filesystem too big. Exiting.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:422
+msgid ""
+"Exceeded MAXENTRIES. Raise this value in mkcramfs.c and recompile. "
+"Exiting.\n"
+msgstr ""
+
+#. (I don't think this can happen with zlib.)
+#: disk-utils/mkfs.cramfs.c:520
+#, c-format
+msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:537
+#, c-format
+msgid "%6.2f%% (%+d bytes)\t%s\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:705
+#, c-format
+msgid ""
+"warning: guestimate of required size (upper bound) is %LdMB, but maximum "
+"image size is %uMB. We might die prematurely.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:747
+#, fuzzy, c-format
+msgid "Including: %s\n"
+msgstr "id inválido: %s\n"
+
+#: disk-utils/mkfs.cramfs.c:753
+#, c-format
+msgid "Directory data: %d bytes\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:761
+#, c-format
+msgid "Everything: %d kilobytes\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:766
+#, fuzzy, c-format
+msgid "Super block: %d bytes\n"
+msgstr "espaço usado: %d bytes\n"
+
+#: disk-utils/mkfs.cramfs.c:773
+#, c-format
+msgid "CRC: %x\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:778
+#, c-format
+msgid "not enough space allocated for ROM image (%Ld allocated, %d used)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:790
+#, c-format
+msgid "ROM image write failed (%d %d)\n"
+msgstr ""
+
+#. (These warnings used to come at the start, but they scroll off the
+#. screen too quickly.)
+#. (can't happen when reading from ext2fs)
+#. bytes, not chars: think UTF8.
+#: disk-utils/mkfs.cramfs.c:799
+#, fuzzy
+msgid "warning: filenames truncated to 255 bytes.\n"
+msgstr "Aviso: contagem de inodes grande demais.\n"
+
+#: disk-utils/mkfs.cramfs.c:802
+msgid "warning: files were skipped due to errors.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:805
+#, c-format
+msgid "warning: file sizes truncated to %luMB (minus 1 byte).\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:810
+#, c-format
+msgid ""
+"warning: uids truncated to %u bits. (This may be a security concern.)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:815
+#, c-format
+msgid ""
+"warning: gids truncated to %u bits. (This may be a security concern.)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:820
+#, c-format
+msgid ""
+"WARNING: device numbers truncated to %u bits. This almost certainly means\n"
+"that some device files will be wrong.\n"
+msgstr ""
+
#: disk-utils/mkfs.minix.c:181
#, c-format
msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
@@ -886,7 +1116,7 @@ msgid "too many bad pages"
msgstr "número excessivo de páginas inválidas"
#: disk-utils/mkswap.c:359 misc-utils/look.c:182 misc-utils/setterm.c:1130
-#: text-utils/more.c:2062 text-utils/more.c:2073
+#: text-utils/more.c:2063 text-utils/more.c:2074
msgid "Out of memory"
msgstr "Memória insuficiente"
@@ -1336,7 +1566,7 @@ msgstr " Lógica"
#. odd flag on end
#. type id
#. type name
-#: fdisk/cfdisk.c:1996 fdisk/fdisk.c:1306 fdisk/fdisk.c:1594
+#: fdisk/cfdisk.c:1996 fdisk/fdisk.c:1318 fdisk/fdisk.c:1606
#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:690 fdisk/sfdisk.c:581
msgid "Unknown"
msgstr "Desconhecido"
@@ -1879,7 +2109,7 @@ msgstr ""
" número de cabeças e número de setores/trilha.\n"
"\n"
-#: fdisk/fdisk.c:194
+#: fdisk/fdisk.c:195
#, fuzzy
msgid ""
"Usage: fdisk [-b SSZ] [-u] DISK Change partition table\n"
@@ -1901,7 +2131,7 @@ msgstr ""
"-u: dá Início e Fim em unidades de setor (em vez de cilindro).\n"
"-b 2048: (para certas unidades MO) usar setores de 2048 bytes.\n"
-#: fdisk/fdisk.c:206
+#: fdisk/fdisk.c:207
msgid ""
"Usage: fdisk [-l] [-b SSZ] [-u] device\n"
"E.g.: fdisk /dev/hda (for the first IDE disk)\n"
@@ -1918,223 +2148,223 @@ msgstr ""
"RAID)\n"
" ...\n"
-#: fdisk/fdisk.c:215
+#: fdisk/fdisk.c:216
#, c-format
msgid "Unable to open %s\n"
msgstr "Não foi possível abrir %s\n"
-#: fdisk/fdisk.c:219
+#: fdisk/fdisk.c:220
#, c-format
msgid "Unable to read %s\n"
msgstr "Não foi possível ler %s\n"
-#: fdisk/fdisk.c:223
+#: fdisk/fdisk.c:224
#, c-format
msgid "Unable to seek on %s\n"
msgstr "Não foi possível realizar busca em %s\n"
-#: fdisk/fdisk.c:227
+#: fdisk/fdisk.c:228
#, c-format
msgid "Unable to write %s\n"
msgstr "Não foi possível gravar em %s\n"
-#: fdisk/fdisk.c:231
+#: fdisk/fdisk.c:232
#, c-format
msgid "BLKGETSIZE ioctl failed on %s\n"
msgstr "ioctl BLKGETSIZE falhou em %s\n"
-#: fdisk/fdisk.c:235
+#: fdisk/fdisk.c:236
msgid "Unable to allocate any more memory\n"
msgstr "Não foi possível alocar mais qualquer memória\n"
-#: fdisk/fdisk.c:238
+#: fdisk/fdisk.c:239
msgid "Fatal error\n"
msgstr "Erro fatal\n"
-#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:359 fdisk/fdisk.c:366
-#: fdisk/fdisk.c:389 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:439
-#: fdisk/fdiskbsdlabel.c:124
+#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:360 fdisk/fdisk.c:367
+#: fdisk/fdisk.c:390 fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:440
+#: fdisk/fdiskbsdlabel.c:129
msgid "Command action"
msgstr "Comando - ação"
-#: fdisk/fdisk.c:323
+#: fdisk/fdisk.c:324
msgid " a toggle a read only flag"
msgstr " a alterna uma opção de somente leitura"
#. sun
-#: fdisk/fdisk.c:324 fdisk/fdisk.c:368
+#: fdisk/fdisk.c:325 fdisk/fdisk.c:369
msgid " b edit bsd disklabel"
msgstr " b edita rótulo BSD no disco"
-#: fdisk/fdisk.c:325
+#: fdisk/fdisk.c:326
msgid " c toggle the mountable flag"
msgstr " c alterna a opção \"montável\""
#. sun
-#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:370
+#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:371
msgid " d delete a partition"
msgstr " d exclui uma partição"
-#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:371
+#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:372
msgid " l list known partition types"
msgstr " l lista os tipos de partição conhecidos"
#. sun
-#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:360 fdisk/fdisk.c:372
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
-#: fdisk/fdiskbsdlabel.c:129
+#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:361 fdisk/fdisk.c:373
+#: fdisk/fdisk.c:398 fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
+#: fdisk/fdiskbsdlabel.c:134
msgid " m print this menu"
msgstr " m mostra este menu"
-#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
+#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374
msgid " n add a new partition"
msgstr " n cria uma nova partição"
-#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:361 fdisk/fdisk.c:374
+#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:362 fdisk/fdisk.c:375
msgid " o create a new empty DOS partition table"
msgstr " o cria uma nova tabela de partições DOS vazia"
-#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:375 fdisk/fdisk.c:398
-#: fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:376 fdisk/fdisk.c:399
+#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
msgid " p print the partition table"
msgstr " p mostra a tabela de partições"
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:362 fdisk/fdisk.c:376
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
-#: fdisk/fdiskbsdlabel.c:132
+#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:363 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:450
+#: fdisk/fdiskbsdlabel.c:137
msgid " q quit without saving changes"
msgstr " q sai sem salvar as alterações"
-#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:363 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:364 fdisk/fdisk.c:378
msgid " s create a new empty Sun disklabel"
msgstr " s cria um novo rótulo de disco Sun vazio"
#. sun
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
msgid " t change a partition's system id"
msgstr " t altera a identificação da partição para o sistema"
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
msgid " u change display/entry units"
msgstr " u altera as unidades das entradas mostradas"
-#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380 fdisk/fdisk.c:402
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:452
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381 fdisk/fdisk.c:403
+#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
msgid " v verify the partition table"
msgstr " v verifica a tabela de partições"
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381 fdisk/fdisk.c:403
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:382 fdisk/fdisk.c:404
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
msgid " w write table to disk and exit"
msgstr " w grava a tabela no disco e sai"
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:383
msgid " x extra functionality (experts only)"
msgstr " x funcionalidade adicional (somente para usuários avançados)"
-#: fdisk/fdisk.c:342
+#: fdisk/fdisk.c:343
msgid " a select bootable partition"
msgstr " a torna a partição inicializável"
#. sgi flavour
-#: fdisk/fdisk.c:343
+#: fdisk/fdisk.c:344
msgid " b edit bootfile entry"
msgstr " b edita uma entrada de arquivo de inicialização"
#. sgi
-#: fdisk/fdisk.c:344
+#: fdisk/fdisk.c:345
msgid " c select sgi swap partition"
msgstr " c seleciona uma partição de permuta (swap) sgi"
-#: fdisk/fdisk.c:367
+#: fdisk/fdisk.c:368
msgid " a toggle a bootable flag"
msgstr " a alterna a opção \"inicializável\""
-#: fdisk/fdisk.c:369
+#: fdisk/fdisk.c:370
msgid " c toggle the dos compatibility flag"
msgstr " c alterna a opção \"compatibilidade\""
-#: fdisk/fdisk.c:390
+#: fdisk/fdisk.c:391
msgid " a change number of alternate cylinders"
msgstr " a alterar número de cilindros alternativos"
#. sun
-#: fdisk/fdisk.c:391 fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:441
+#: fdisk/fdisk.c:392 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
msgid " c change number of cylinders"
msgstr " c alterar número de cilindros"
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:393 fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:443
msgid " d print the raw data in the partition table"
msgstr " d mostrar os dados sem formatação da tabela de partições"
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:394
msgid " e change number of extra sectors per cylinder"
msgstr " e alterar número de setores extras por cilindro"
#. sun
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:395 fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
msgid " h change number of heads"
msgstr " h alterar número de cabeças"
-#: fdisk/fdisk.c:395
+#: fdisk/fdisk.c:396
msgid " i change interleave factor"
msgstr " i alterar fator de \"interleave\""
#. sun
-#: fdisk/fdisk.c:396
+#: fdisk/fdisk.c:397
msgid " o change rotation speed (rpm)"
msgstr " o alterar velocidade de rotação (RPM)"
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:450
-#: fdisk/fdiskbsdlabel.c:133
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:451
+#: fdisk/fdiskbsdlabel.c:138
msgid " r return to main menu"
msgstr " r voltar ao menu principal"
-#: fdisk/fdisk.c:401 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:452
msgid " s change number of sectors/track"
msgstr " s alterar número de setores/trilha"
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:405
msgid " y change number of physical cylinders"
msgstr " y alterar número de cilindros físicos"
-#: fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:440
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:441
msgid " b move beginning of data in a partition"
msgstr " b mover início dos dados em uma partição"
-#: fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:443
+#: fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:444
msgid " e list extended partitions"
msgstr " e listar partições estendidas"
#. !sun
-#: fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
#, fuzzy
msgid " g create an IRIX (SGI) partition table"
msgstr " g criar uma tabela de partições IRIX"
#. !sun
-#: fdisk/fdisk.c:444
+#: fdisk/fdisk.c:445
msgid " f fix partition order"
msgstr " f corrige ordem de partição"
-#: fdisk/fdisk.c:561
+#: fdisk/fdisk.c:562
msgid "You must set"
msgstr "Você precisa configurar"
-#: fdisk/fdisk.c:575
+#: fdisk/fdisk.c:576
msgid "heads"
msgstr "cabeças"
-#: fdisk/fdisk.c:577 fdisk/fdisk.c:1142 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:578 fdisk/fdisk.c:1154 fdisk/sfdisk.c:864
msgid "sectors"
msgstr "setores"
-#: fdisk/fdisk.c:579 fdisk/fdisk.c:1142 fdisk/fdiskbsdlabel.c:464
+#: fdisk/fdisk.c:580 fdisk/fdisk.c:1154 fdisk/fdiskbsdlabel.c:469
#: fdisk/sfdisk.c:864
msgid "cylinders"
msgstr "cilindros"
-#: fdisk/fdisk.c:583
+#: fdisk/fdisk.c:584
#, c-format
msgid ""
"%s%s.\n"
@@ -2143,11 +2373,11 @@ msgstr ""
"%s%s.\n"
"Você pode fazer isto a partir do menu de funções extras.\n"
-#: fdisk/fdisk.c:584
+#: fdisk/fdisk.c:585
msgid " and "
msgstr " e "
-#: fdisk/fdisk.c:601
+#: fdisk/fdisk.c:602
#, c-format
msgid ""
"\n"
@@ -2167,26 +2397,26 @@ msgstr ""
"2) inicialização e programas de particionamento de outros OSs\n"
" (p.ex., DOS FDISK, OS/2 FDISK)\n"
-#: fdisk/fdisk.c:624
+#: fdisk/fdisk.c:625
msgid "Bad offset in primary extended partition\n"
msgstr "Deslocamento inválido em uma partição primária estendida\n"
-#: fdisk/fdisk.c:638
+#: fdisk/fdisk.c:639
#, c-format
msgid "Warning: deleting partitions after %d\n"
msgstr "Aviso: excluindo partições após %d\n"
-#: fdisk/fdisk.c:655
+#: fdisk/fdisk.c:656
#, c-format
msgid "Warning: extra link pointer in partition table %d\n"
msgstr "Aviso: ponteiro de vínculo extra na tabela de partições %d\n"
-#: fdisk/fdisk.c:663
+#: fdisk/fdisk.c:664
#, c-format
msgid "Warning: ignoring extra data in partition table %d\n"
msgstr "Aviso: ignorando dados extras na tabela de partições %d\n"
-#: fdisk/fdisk.c:708
+#: fdisk/fdisk.c:709
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"
@@ -2198,16 +2428,22 @@ msgstr ""
"o conteúdo anterior não poderá mais ser recuperado.\n"
"\n"
-#: fdisk/fdisk.c:752
+#: fdisk/fdisk.c:753
#, c-format
msgid "Note: sector size is %d (not %d)\n"
msgstr "Nota: o tamanho do setor é %d (não %d)\n"
-#: fdisk/fdisk.c:870
+#: fdisk/fdisk.c:883
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:903
+#: fdisk/fdisk.c:914
+msgid ""
+"This disk has both DOS and BSD magic.\n"
+"Give the 'b' command to go to BSD mode.\n"
+msgstr ""
+
+#: fdisk/fdisk.c:924
msgid ""
"Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
"disklabel\n"
@@ -2215,16 +2451,16 @@ msgstr ""
"O dispositivo não contém nem uma tabela de partições DOS válida nem um "
"rótulo de disco Sun, OSF ou SGI\n"
-#: fdisk/fdisk.c:920
+#: fdisk/fdisk.c:942
msgid "Internal error\n"
msgstr "Erro interno\n"
-#: fdisk/fdisk.c:942
+#: fdisk/fdisk.c:954
#, c-format
msgid "Ignoring extra extended partition %d\n"
msgstr "Ignorando partição estendida extra %d\n"
-#: fdisk/fdisk.c:954
+#: fdisk/fdisk.c:966
#, c-format
msgid ""
"Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2233,7 +2469,7 @@ msgstr ""
"Aviso: a opção inválida 0x%04x da tabela de partições %d será corrigida por "
"gravação (w)\n"
-#: fdisk/fdisk.c:976
+#: fdisk/fdisk.c:988
msgid ""
"\n"
"got EOF thrice - exiting..\n"
@@ -2241,65 +2477,65 @@ msgstr ""
"\n"
"EOF (fim de arquivo) recebido três vezes - saindo...\n"
-#: fdisk/fdisk.c:1015
+#: fdisk/fdisk.c:1027
msgid "Hex code (type L to list codes): "
msgstr "Código hexadecimal (digite L para listar os códigos): "
-#: fdisk/fdisk.c:1054
+#: fdisk/fdisk.c:1066
#, c-format
msgid "%s (%d-%d, default %d): "
msgstr "%s (%d-%d, padrão %d):"
-#: fdisk/fdisk.c:1110
+#: fdisk/fdisk.c:1122
#, c-format
msgid "Using default value %d\n"
msgstr "Usando valor padrão %d\n"
-#: fdisk/fdisk.c:1114
+#: fdisk/fdisk.c:1126
msgid "Value out of range.\n"
msgstr "Valor fora do intervalo.\n"
-#: fdisk/fdisk.c:1124
+#: fdisk/fdisk.c:1136
msgid "Partition number"
msgstr "Número da partição"
-#: fdisk/fdisk.c:1133
+#: fdisk/fdisk.c:1145
#, c-format
msgid "Warning: partition %d has empty type\n"
msgstr "Aviso: a partição %d possui tipo vazio\n"
-#: fdisk/fdisk.c:1140
+#: fdisk/fdisk.c:1152
msgid "cylinder"
msgstr "cilindro"
-#: fdisk/fdisk.c:1140
+#: fdisk/fdisk.c:1152
msgid "sector"
msgstr "setor"
-#: fdisk/fdisk.c:1149
+#: fdisk/fdisk.c:1161
#, c-format
msgid "Changing display/entry units to %s\n"
msgstr "Mudando as unidades das entradas mostradas para %s\n"
-#: fdisk/fdisk.c:1160
+#: fdisk/fdisk.c:1172
#, c-format
msgid "WARNING: Partition %d is an extended partition\n"
msgstr "AVISO: A partição %d é uma partição estendida\n"
-#: fdisk/fdisk.c:1171
+#: fdisk/fdisk.c:1183
msgid "DOS Compatibility flag is set\n"
msgstr "A opção de compatibilidade DOS está ativada\n"
-#: fdisk/fdisk.c:1175
+#: fdisk/fdisk.c:1187
msgid "DOS Compatibility flag is not set\n"
msgstr "A opção de compatibilidade DOS não está ativada\n"
-#: fdisk/fdisk.c:1261
+#: fdisk/fdisk.c:1273
#, c-format
msgid "Partition %d does not exist yet!\n"
msgstr "A partição %d ainda não existe!\n"
-#: fdisk/fdisk.c:1266
+#: fdisk/fdisk.c:1278
msgid ""
"Type 0 means free space to many systems\n"
"(but not to Linux). Having partitions of\n"
@@ -2311,7 +2547,7 @@ msgstr ""
"tipo 0 não é recomendável. Você pode excluir\n"
"uma partição usando o comando `d'.\n"
-#: fdisk/fdisk.c:1275
+#: fdisk/fdisk.c:1287
msgid ""
"You cannot change a partition into an extended one or vice versa\n"
"Delete it first.\n"
@@ -2319,7 +2555,7 @@ msgstr ""
"Você não pode alterar uma partição normal para estendida ou vice-versa.\n"
"Exclua a partição antes.\n"
-#: fdisk/fdisk.c:1284
+#: fdisk/fdisk.c:1296
msgid ""
"Consider leaving partition 3 as Whole disk (5),\n"
"as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2329,7 +2565,7 @@ msgstr ""
"uma vez que o SunOS/Solaris espera isto e até mesmo o Linux gosta disto.\n"
"\n"
-#: fdisk/fdisk.c:1290
+#: fdisk/fdisk.c:1302
msgid ""
"Consider leaving partition 9 as volume header (0),\n"
"and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2339,52 +2575,52 @@ msgstr ""
"e a partição 11 como um volume inteiro (6), uma vez que o IRIX espera isto.\n"
"\n"
-#: fdisk/fdisk.c:1303
+#: fdisk/fdisk.c:1315
#, c-format
msgid "Changed system type of partition %d to %x (%s)\n"
msgstr "O tipo da partição %d foi alterado para %x (%s)\n"
-#: fdisk/fdisk.c:1357
+#: fdisk/fdisk.c:1369
#, c-format
msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
msgstr "A partição %d possui inícios físico/lógico diferentes (não Linux?):\n"
-#: fdisk/fdisk.c:1359 fdisk/fdisk.c:1367 fdisk/fdisk.c:1376 fdisk/fdisk.c:1385
+#: fdisk/fdisk.c:1371 fdisk/fdisk.c:1379 fdisk/fdisk.c:1388 fdisk/fdisk.c:1397
#, c-format
msgid " phys=(%d, %d, %d) "
msgstr " fís. = (%d, %d, %d) "
-#: fdisk/fdisk.c:1360 fdisk/fdisk.c:1368
+#: fdisk/fdisk.c:1372 fdisk/fdisk.c:1380
#, c-format
msgid "logical=(%d, %d, %d)\n"
msgstr "lógico = (%d, %d, %d)\n"
-#: fdisk/fdisk.c:1365
+#: fdisk/fdisk.c:1377
#, c-format
msgid "Partition %d has different physical/logical endings:\n"
msgstr "A partição %d possui fins físico/lógico diferentes:\n"
-#: fdisk/fdisk.c:1374
+#: fdisk/fdisk.c:1386
#, c-format
msgid "Partition %i does not start on cylinder boundary:\n"
msgstr "A partição %i não inicia em um limite de cilindro:\n"
-#: fdisk/fdisk.c:1377
+#: fdisk/fdisk.c:1389
#, c-format
msgid "should be (%d, %d, 1)\n"
msgstr "deveria ser (%d, %d, 1)\n"
-#: fdisk/fdisk.c:1383
+#: fdisk/fdisk.c:1395
#, c-format
msgid "Partition %i does not end on cylinder boundary:\n"
msgstr "A partição %i não termina em um limite de cilindro:\n"
-#: fdisk/fdisk.c:1386
+#: fdisk/fdisk.c:1398
#, c-format
msgid "should be (%d, %d, %d)\n"
msgstr "deveria ser (%d, %d, %d)\n"
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1405
#, c-format
msgid ""
"\n"
@@ -2397,7 +2633,7 @@ msgstr ""
"Unidades = %s de %d * %d bytes\n"
"\n"
-#: fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1513
msgid ""
"Nothing to do. Ordering is correct already.\n"
"\n"
@@ -2405,16 +2641,16 @@ msgstr ""
"Nada a fazer. Ordem já está correta\n"
"\n"
-#: fdisk/fdisk.c:1565
+#: fdisk/fdisk.c:1577
#, c-format
msgid "%*s Boot Start End Blocks Id System\n"
msgstr "%*s Boot Início Fim Blocos Id Sistema\n"
-#: fdisk/fdisk.c:1566 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:675
+#: fdisk/fdisk.c:1578 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:675
msgid "Device"
msgstr "Dispositivo"
-#: fdisk/fdisk.c:1603
+#: fdisk/fdisk.c:1615
msgid ""
"\n"
"Partition table entries are not in disk order\n"
@@ -2422,7 +2658,7 @@ msgstr ""
"\n"
"Partições lógicas fora da ordem do disco\n"
-#: fdisk/fdisk.c:1613
+#: fdisk/fdisk.c:1625
#, c-format
msgid ""
"\n"
@@ -2433,94 +2669,94 @@ msgstr ""
"Disco %s: %d cabeças, %d setores, %d cilindros\n"
"\n"
-#: fdisk/fdisk.c:1615
+#: fdisk/fdisk.c:1627
msgid "Nr AF Hd Sec Cyl Hd Sec Cyl Start Size ID\n"
msgstr "No OA Cb Set Cil Cb Set Cil Início Tam ID\n"
-#: fdisk/fdisk.c:1659
+#: fdisk/fdisk.c:1671
#, c-format
msgid "Warning: partition %d contains sector 0\n"
msgstr "Aviso: a partição %d contém o setor 0\n"
-#: fdisk/fdisk.c:1662
+#: fdisk/fdisk.c:1674
#, c-format
msgid "Partition %d: head %d greater than maximum %d\n"
msgstr "Partição %d: a cabeça %d é maior do que o máximo: %d\n"
-#: fdisk/fdisk.c:1665
+#: fdisk/fdisk.c:1677
#, c-format
msgid "Partition %d: sector %d greater than maximum %d\n"
msgstr "Partição %d: o setor %d é maior do que o máximo: %d\n"
-#: fdisk/fdisk.c:1668
+#: fdisk/fdisk.c:1680
#, c-format
msgid "Partitions %d: cylinder %d greater than maximum %d\n"
msgstr "Partição %d: o cilindro %d é maior do que o máximo: %d\n"
-#: fdisk/fdisk.c:1672
+#: fdisk/fdisk.c:1684
#, c-format
msgid "Partition %d: previous sectors %d disagrees with total %d\n"
msgstr ""
"Partição %d: os setores anteriores %d não estão de acordo com o total: %d\n"
-#: fdisk/fdisk.c:1704
+#: fdisk/fdisk.c:1716
#, c-format
msgid "Warning: bad start-of-data in partition %d\n"
msgstr "Aviso: início de dados inválido na partição %d\n"
-#: fdisk/fdisk.c:1712
+#: fdisk/fdisk.c:1724
#, c-format
msgid "Warning: partition %d overlaps partition %d.\n"
msgstr "Aviso: a partição %d sobrepõe-se à partição %d.\n"
-#: fdisk/fdisk.c:1732
+#: fdisk/fdisk.c:1744
#, c-format
msgid "Warning: partition %d is empty\n"
msgstr "Aviso: a partição %d está vazia\n"
-#: fdisk/fdisk.c:1737
+#: fdisk/fdisk.c:1749
#, c-format
msgid "Logical partition %d not entirely in partition %d\n"
msgstr "A partição lógica %d não está completamente na partição %d\n"
-#: fdisk/fdisk.c:1743
+#: fdisk/fdisk.c:1755
#, c-format
msgid "Total allocated sectors %d greater than the maximum %d\n"
msgstr "O total de setores alocados, %d, é maior do que o máximo: %d\n"
-#: fdisk/fdisk.c:1746
+#: fdisk/fdisk.c:1758
#, c-format
msgid "%d unallocated sectors\n"
msgstr "%d setores não alocados\n"
-#: fdisk/fdisk.c:1759 fdisk/fdisksgilabel.c:661 fdisk/fdisksunlabel.c:505
+#: fdisk/fdisk.c:1771 fdisk/fdisksgilabel.c:661 fdisk/fdisksunlabel.c:505
#, c-format
msgid "Partition %d is already defined. Delete it before re-adding it.\n"
msgstr ""
"A partição %d já está definida. Exclua essa partição antes de adicioná-la "
"novamente.\n"
-#: fdisk/fdisk.c:1780 fdisk/fdiskbsdlabel.c:279 fdisk/fdisksgilabel.c:683
+#: fdisk/fdisk.c:1792 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:683
#: fdisk/fdisksunlabel.c:520
#, c-format
msgid "First %s"
msgstr "Primeiro %s"
-#: fdisk/fdisk.c:1795 fdisk/fdisksunlabel.c:561
+#: fdisk/fdisk.c:1807 fdisk/fdisksunlabel.c:561
#, c-format
msgid "Sector %d is already allocated\n"
msgstr "O setor %d já está alocado\n"
-#: fdisk/fdisk.c:1831
+#: fdisk/fdisk.c:1843
msgid "No free sectors available\n"
msgstr "Não há setores livres disponíveis\n"
-#: fdisk/fdisk.c:1840 fdisk/fdiskbsdlabel.c:286 fdisk/fdisksunlabel.c:572
+#: fdisk/fdisk.c:1852 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:572
#, c-format
msgid "Last %s or +size or +sizeM or +sizeK"
msgstr "Último %s ou +tamanho ou +tamanho M ou +tamanho K"
-#: fdisk/fdisk.c:1905
+#: fdisk/fdisk.c:1917
msgid ""
"\tSorry - this fdisk cannot handle AIX disk labels.\n"
"\tIf you want to add DOS-type partitions, create\n"
@@ -2528,17 +2764,17 @@ msgid ""
"\tWARNING: This will destroy the present disk contents.\n"
msgstr ""
-#: fdisk/fdisk.c:1914 fdisk/fdiskbsdlabel.c:613
+#: fdisk/fdisk.c:1926 fdisk/fdiskbsdlabel.c:617
msgid "The maximum number of partitions has been created\n"
msgstr "O número máximo de partições foi criado\n"
-#: fdisk/fdisk.c:1924
+#: fdisk/fdisk.c:1936
msgid "You must delete some partition and add an extended partition first\n"
msgstr ""
"Você precisa excluir alguma partição e adicionar uma partição estendida "
"antes\n"
-#: fdisk/fdisk.c:1929
+#: fdisk/fdisk.c:1941
#, c-format
msgid ""
"Command action\n"
@@ -2549,20 +2785,20 @@ msgstr ""
" %s\n"
" p partição primária (1-4)\n"
-#: fdisk/fdisk.c:1931
+#: fdisk/fdisk.c:1943
msgid "l logical (5 or over)"
msgstr "l lógica (5 ou superior)"
-#: fdisk/fdisk.c:1931
+#: fdisk/fdisk.c:1943
msgid "e extended"
msgstr "e estendida"
-#: fdisk/fdisk.c:1948
+#: fdisk/fdisk.c:1960
#, c-format
msgid "Invalid partition number for type `%c'\n"
msgstr "Número de partição inválido para o tipo `%c'\n"
-#: fdisk/fdisk.c:1984
+#: fdisk/fdisk.c:1996
msgid ""
"The partition table has been altered!\n"
"\n"
@@ -2570,11 +2806,11 @@ msgstr ""
"A tabela de partições foi alterada!\n"
"\n"
-#: fdisk/fdisk.c:1993
+#: fdisk/fdisk.c:2005
msgid "Calling ioctl() to re-read partition table.\n"
msgstr "Chamando ioctl() para reler tabela de partições.\n"
-#: fdisk/fdisk.c:2009
+#: fdisk/fdisk.c:2021
#, c-format
msgid ""
"\n"
@@ -2583,7 +2819,7 @@ msgid ""
"The new table will be used at the next reboot.\n"
msgstr ""
-#: fdisk/fdisk.c:2019
+#: fdisk/fdisk.c:2031
msgid ""
"\n"
"WARNING: If you have created or modified any DOS 6.x\n"
@@ -2595,67 +2831,67 @@ msgstr ""
"partição DOS 6.x, consulte a página de manual\n"
"do fdisk para obter informações adicionais.\n"
-#: fdisk/fdisk.c:2026
+#: fdisk/fdisk.c:2038
msgid "Syncing disks.\n"
msgstr "Sincronizando discos.\n"
-#: fdisk/fdisk.c:2073
+#: fdisk/fdisk.c:2085
#, c-format
msgid "Partition %d has no data area\n"
msgstr "A partição %d não possui área de dados\n"
-#: fdisk/fdisk.c:2078
+#: fdisk/fdisk.c:2090
msgid "New beginning of data"
msgstr "Novo início dos dados"
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2106
msgid "Expert command (m for help): "
msgstr "Comando avançado (m para ajuda): "
-#: fdisk/fdisk.c:2107
+#: fdisk/fdisk.c:2119
msgid "Number of cylinders"
msgstr "Número de cilindros"
-#: fdisk/fdisk.c:2134
+#: fdisk/fdisk.c:2146
msgid "Number of heads"
msgstr "Número de cabeças"
-#: fdisk/fdisk.c:2159
+#: fdisk/fdisk.c:2171
msgid "Number of sectors"
msgstr "Número de setores"
-#: fdisk/fdisk.c:2162
+#: fdisk/fdisk.c:2174
msgid "Warning: setting sector offset for DOS compatiblity\n"
msgstr ""
"Aviso: configurando o deslocamento de setor para compatibilidade com DOS\n"
-#: fdisk/fdisk.c:2237
+#: fdisk/fdisk.c:2249
#, c-format
msgid "Disk %s doesn't contain a valid partition table\n"
msgstr "O disco %s não contém uma tabela de partições válida\n"
-#: fdisk/fdisk.c:2251
+#: fdisk/fdisk.c:2263
#, c-format
msgid "Cannot open %s\n"
msgstr "Não foi possível abrir %s\n"
-#: fdisk/fdisk.c:2267 fdisk/sfdisk.c:2363
+#: fdisk/fdisk.c:2279 fdisk/sfdisk.c:2363
#, c-format
msgid "cannot open %s\n"
msgstr "não foi possível abrir %s\n"
-#: fdisk/fdisk.c:2289
+#: fdisk/fdisk.c:2301
#, c-format
msgid "%c: unknown command\n"
msgstr "%c: comando desconhecido:\n"
-#: fdisk/fdisk.c:2339
+#: fdisk/fdisk.c:2351
msgid "This kernel finds the sector size itself - -b option ignored\n"
msgstr ""
"Este kernel localiza o tamanho de setor por conta própria - opção -b "
"ignorada\n"
-#: fdisk/fdisk.c:2342
+#: fdisk/fdisk.c:2355
msgid ""
"Warning: the -b (set sector size) option should be used with one specified "
"device\n"
@@ -2663,20 +2899,19 @@ msgstr ""
"Aviso: a opção -b (configurar tamanho de setor) deve ser usada com um "
"dispositivo especificado\n"
-#: fdisk/fdisk.c:2405
-#, c-format
-msgid ""
-"Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
-"To return to DOS partition table mode, use the 'r' command.\n"
+#. OSF label, and no DOS label
+#: fdisk/fdisk.c:2414
+#, fuzzy, c-format
+msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
msgstr ""
"Detectado um rótulo OSF/1 em %s, entrando em modo de rótulo.\n"
"Para retornar ao modo de tabela de partições do DOS, use o comando 'r'.\n"
-#: fdisk/fdisk.c:2413
+#: fdisk/fdisk.c:2424
msgid "Command (m for help): "
msgstr "Comando (m para ajuda): "
-#: fdisk/fdisk.c:2429
+#: fdisk/fdisk.c:2440
#, c-format
msgid ""
"\n"
@@ -2685,15 +2920,15 @@ msgstr ""
"\n"
"O arquivo de boot atual é: %s\n"
-#: fdisk/fdisk.c:2431
+#: fdisk/fdisk.c:2442
msgid "Please enter the name of the new boot file: "
msgstr "Informe o nome do novo arquivo de boot: "
-#: fdisk/fdisk.c:2433
+#: fdisk/fdisk.c:2444
msgid "Boot file unchanged\n"
msgstr "Arquivo de boot inalterado\n"
-#: fdisk/fdisk.c:2497
+#: fdisk/fdisk.c:2508
msgid ""
"\n"
"\tSorry, no experts menu for SGI partition tables available.\n"
@@ -2732,7 +2967,7 @@ msgstr ""
"\t remover o disco logicamente de sua máquina AIX\n"
"\t (do contrário você irá se tornar um AIXpert)."
-#: fdisk/fdiskbsdlabel.c:117
+#: fdisk/fdiskbsdlabel.c:122
#, c-format
msgid ""
"\n"
@@ -2741,167 +2976,167 @@ msgstr ""
"\n"
"Rótulo BSD do dispositivo: %s\n"
-#: fdisk/fdiskbsdlabel.c:125
+#: fdisk/fdiskbsdlabel.c:130
msgid " d delete a BSD partition"
msgstr " d exclui uma partição BSD"
-#: fdisk/fdiskbsdlabel.c:126
+#: fdisk/fdiskbsdlabel.c:131
msgid " e edit drive data"
msgstr " e edita dados do disco"
-#: fdisk/fdiskbsdlabel.c:127
+#: fdisk/fdiskbsdlabel.c:132
msgid " i install bootstrap"
msgstr " i instala código de inicialização (bootstrap)"
-#: fdisk/fdiskbsdlabel.c:128
+#: fdisk/fdiskbsdlabel.c:133
msgid " l list known filesystem types"
msgstr " l lista os tipos de sistemas de arquivos conhecidos"
-#: fdisk/fdiskbsdlabel.c:130
+#: fdisk/fdiskbsdlabel.c:135
msgid " n add a new BSD partition"
msgstr " n cria uma nova partição BSD"
-#: fdisk/fdiskbsdlabel.c:131
+#: fdisk/fdiskbsdlabel.c:136
msgid " p print BSD partition table"
msgstr " p mostra a tabela de partições BSD"
-#: fdisk/fdiskbsdlabel.c:134
+#: fdisk/fdiskbsdlabel.c:139
msgid " s show complete disklabel"
msgstr " s mostra o rótulo do disco completo"
-#: fdisk/fdiskbsdlabel.c:135
+#: fdisk/fdiskbsdlabel.c:140
msgid " t change a partition's filesystem id"
msgstr " t altera a identificação do sistema de arquivos"
-#: fdisk/fdiskbsdlabel.c:136
+#: fdisk/fdiskbsdlabel.c:141
msgid " u change units (cylinders/sectors)"
msgstr " u altera unidades (cilindros/setores)"
-#: fdisk/fdiskbsdlabel.c:137
+#: fdisk/fdiskbsdlabel.c:142
msgid " w write disklabel to disk"
msgstr " w grava o rótulo do disco no disco"
-#: fdisk/fdiskbsdlabel.c:139
+#: fdisk/fdiskbsdlabel.c:144
msgid " x link BSD partition to non-BSD partition"
msgstr " x vincula partição BSD a partição não BSD"
-#: fdisk/fdiskbsdlabel.c:171
+#: fdisk/fdiskbsdlabel.c:176
#, c-format
msgid "Partition %s has invalid starting sector 0.\n"
msgstr "A partição %s possui setor inicial 0 inválido.\n"
-#: fdisk/fdiskbsdlabel.c:175
+#: fdisk/fdiskbsdlabel.c:180
#, c-format
msgid "Reading disklabel of %s at sector %d.\n"
msgstr "Lendo rótulo de disco de %s no setor %d.\n"
-#: fdisk/fdiskbsdlabel.c:185
+#: fdisk/fdiskbsdlabel.c:190
#, c-format
msgid "There is no *BSD partition on %s.\n"
msgstr "Não existe partição %BSD em %s.\n"
-#: fdisk/fdiskbsdlabel.c:199
+#: fdisk/fdiskbsdlabel.c:204
msgid "BSD disklabel command (m for help): "
msgstr "Comando para rótulo de disco BSD (tecle m para obter ajuda): "
-#: fdisk/fdiskbsdlabel.c:313
+#: fdisk/fdiskbsdlabel.c:318
#, c-format
msgid "type: %s\n"
msgstr "tipo: %s\n"
-#: fdisk/fdiskbsdlabel.c:315
+#: fdisk/fdiskbsdlabel.c:320
#, c-format
msgid "type: %d\n"
msgstr "tipo: %d\n"
-#: fdisk/fdiskbsdlabel.c:316
+#: fdisk/fdiskbsdlabel.c:321
#, c-format
msgid "disk: %.*s\n"
msgstr "disco: %.*s\n"
-#: fdisk/fdiskbsdlabel.c:317
+#: fdisk/fdiskbsdlabel.c:322
#, c-format
msgid "label: %.*s\n"
msgstr "rótulo: %.*s\n"
-#: fdisk/fdiskbsdlabel.c:318
+#: fdisk/fdiskbsdlabel.c:323
msgid "flags:"
msgstr "opções:"
-#: fdisk/fdiskbsdlabel.c:320
+#: fdisk/fdiskbsdlabel.c:325
msgid " removable"
msgstr " removable"
-#: fdisk/fdiskbsdlabel.c:322
+#: fdisk/fdiskbsdlabel.c:327
msgid " ecc"
msgstr " ecc"
-#: fdisk/fdiskbsdlabel.c:324
+#: fdisk/fdiskbsdlabel.c:329
msgid " badsect"
msgstr " badsect"
#. On various machines the fields of *lp are short/int/long
#. In order to avoid problems, we cast them all to long.
-#: fdisk/fdiskbsdlabel.c:328
+#: fdisk/fdiskbsdlabel.c:333
#, c-format
msgid "bytes/sector: %ld\n"
msgstr "bytes/setor: %ld\n"
-#: fdisk/fdiskbsdlabel.c:329
+#: fdisk/fdiskbsdlabel.c:334
#, c-format
msgid "sectors/track: %ld\n"
msgstr "setores/trilha: %ld\n"
-#: fdisk/fdiskbsdlabel.c:330
+#: fdisk/fdiskbsdlabel.c:335
#, c-format
msgid "tracks/cylinder: %ld\n"
msgstr "trilhas/cilindro: %ld\n"
-#: fdisk/fdiskbsdlabel.c:331
+#: fdisk/fdiskbsdlabel.c:336
#, c-format
msgid "sectors/cylinder: %ld\n"
msgstr "setores/cilindro: %ld\n"
-#: fdisk/fdiskbsdlabel.c:332
+#: fdisk/fdiskbsdlabel.c:337
#, c-format
msgid "cylinders: %ld\n"
msgstr "cilindros: %ld\n"
-#: fdisk/fdiskbsdlabel.c:333
+#: fdisk/fdiskbsdlabel.c:338
#, c-format
msgid "rpm: %d\n"
msgstr "RPM: %d\n"
-#: fdisk/fdiskbsdlabel.c:334
+#: fdisk/fdiskbsdlabel.c:339
#, c-format
msgid "interleave: %d\n"
msgstr "interleave: %d\n"
-#: fdisk/fdiskbsdlabel.c:335
+#: fdisk/fdiskbsdlabel.c:340
#, c-format
msgid "trackskew: %d\n"
msgstr "trackskew: %d\n"
-#: fdisk/fdiskbsdlabel.c:336
+#: fdisk/fdiskbsdlabel.c:341
#, c-format
msgid "cylinderskew: %d\n"
msgstr "cylinderskew: %d\n"
-#: fdisk/fdiskbsdlabel.c:337
+#: fdisk/fdiskbsdlabel.c:342
#, c-format
msgid "headswitch: %ld\t\t# milliseconds\n"
msgstr "headswitch: %ld\t\t# milissegundos\n"
-#: fdisk/fdiskbsdlabel.c:339
+#: fdisk/fdiskbsdlabel.c:344
#, c-format
msgid "track-to-track seek: %ld\t# milliseconds\n"
msgstr "busca trilha a trilha: %ld\t# milissegundos\n"
-#: fdisk/fdiskbsdlabel.c:341
+#: fdisk/fdiskbsdlabel.c:346
msgid "drivedata: "
msgstr "drivedata: "
-#: fdisk/fdiskbsdlabel.c:350
+#: fdisk/fdiskbsdlabel.c:355
#, c-format
msgid ""
"\n"
@@ -2910,97 +3145,97 @@ msgstr ""
"\n"
"%d partições:\n"
-#: fdisk/fdiskbsdlabel.c:351
+#: fdisk/fdiskbsdlabel.c:356
msgid "# start end size fstype [fsize bsize cpg]\n"
msgstr "# início fim tamanho tipoSA [fsize bsize cpg]\n"
-#: fdisk/fdiskbsdlabel.c:400 fdisk/fdiskbsdlabel.c:403
+#: fdisk/fdiskbsdlabel.c:405 fdisk/fdiskbsdlabel.c:408
#, c-format
msgid "Writing disklabel to %s.\n"
msgstr "Gravando rótulo de disco em %s.\n"
-#: fdisk/fdiskbsdlabel.c:415 fdisk/fdiskbsdlabel.c:417
+#: fdisk/fdiskbsdlabel.c:420 fdisk/fdiskbsdlabel.c:422
#, c-format
msgid "%s contains no disklabel.\n"
msgstr "%s não contém um rótulo de disco.\n"
-#: fdisk/fdiskbsdlabel.c:422
+#: fdisk/fdiskbsdlabel.c:427
msgid "Do you want to create a disklabel? (y/n) "
msgstr "Você deseja criar um rótulo de disco? (s/n) "
-#: fdisk/fdiskbsdlabel.c:461
+#: fdisk/fdiskbsdlabel.c:466
msgid "bytes/sector"
msgstr "bytes/setor"
-#: fdisk/fdiskbsdlabel.c:462
+#: fdisk/fdiskbsdlabel.c:467
msgid "sectors/track"
msgstr "setores/trilha"
-#: fdisk/fdiskbsdlabel.c:463
+#: fdisk/fdiskbsdlabel.c:468
msgid "tracks/cylinder"
msgstr "trilhas/cilindro"
-#: fdisk/fdiskbsdlabel.c:471
+#: fdisk/fdiskbsdlabel.c:476
msgid "sectors/cylinder"
msgstr "setores/cilindro"
-#: fdisk/fdiskbsdlabel.c:475
+#: fdisk/fdiskbsdlabel.c:480
msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
msgstr "Precisa ser <= setores/trilha * trilhas/cilindro (padrão).\n"
-#: fdisk/fdiskbsdlabel.c:477
+#: fdisk/fdiskbsdlabel.c:482
msgid "rpm"
msgstr "RPM"
-#: fdisk/fdiskbsdlabel.c:478
+#: fdisk/fdiskbsdlabel.c:483
msgid "interleave"
msgstr "interleave"
-#: fdisk/fdiskbsdlabel.c:479
+#: fdisk/fdiskbsdlabel.c:484
msgid "trackskew"
msgstr "trackskew"
-#: fdisk/fdiskbsdlabel.c:480
+#: fdisk/fdiskbsdlabel.c:485
msgid "cylinderskew"
msgstr "cylinderskew"
-#: fdisk/fdiskbsdlabel.c:481
+#: fdisk/fdiskbsdlabel.c:486
msgid "headswitch"
msgstr "headswitch"
-#: fdisk/fdiskbsdlabel.c:482
+#: fdisk/fdiskbsdlabel.c:487
msgid "track-to-track seek"
msgstr "busca trilha a trilha"
-#: fdisk/fdiskbsdlabel.c:523
+#: fdisk/fdiskbsdlabel.c:528
#, c-format
msgid "Bootstrap: %sboot -> boot%s (%s): "
msgstr "Bootstrap (código de inicialização): %sboot -> boot%s (%s): "
-#: fdisk/fdiskbsdlabel.c:548
+#: fdisk/fdiskbsdlabel.c:553
msgid "Bootstrap overlaps with disk label!\n"
msgstr "Bootstrap (código de inicialização) sobreposto ao rótulo do disco!\n"
-#: fdisk/fdiskbsdlabel.c:569 fdisk/fdiskbsdlabel.c:571
+#: fdisk/fdiskbsdlabel.c:574 fdisk/fdiskbsdlabel.c:576
#, c-format
msgid "Bootstrap installed on %s.\n"
msgstr "Bootstrap (código de inicialização) instalado em %s.\n"
-#: fdisk/fdiskbsdlabel.c:593
+#: fdisk/fdiskbsdlabel.c:598
#, c-format
msgid "Partition (a-%c): "
msgstr "Partição (a-%c): "
-#: fdisk/fdiskbsdlabel.c:624
+#: fdisk/fdiskbsdlabel.c:629
msgid "This partition already exists.\n"
msgstr "Esta partição já existe.\n"
-#: fdisk/fdiskbsdlabel.c:744
+#: fdisk/fdiskbsdlabel.c:755
#, c-format
msgid "Warning: too many partitions (%d, maximum is %d).\n"
msgstr "Aviso: número de partições excessivo (%d; o máximo é %d).\n"
-#: fdisk/fdiskbsdlabel.c:791
+#: fdisk/fdiskbsdlabel.c:803
msgid ""
"\n"
"Syncing disks.\n"
@@ -4966,140 +5201,126 @@ msgstr "getopt (melhorado) 1.1.0)\n"
msgid "internal error, contact the author."
msgstr "erro interno, entre em contato com o autor."
-#: hwclock/cmos.c:168
+#: hwclock/cmos.c:172
msgid "booted from MILO\n"
msgstr "boot executado do MILO\n"
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:181
msgid "Ruffian BCD clock\n"
msgstr "Relógio BCD Ruffian\n"
-#: hwclock/cmos.c:193
+#: hwclock/cmos.c:197
#, c-format
msgid "clockport adjusted to 0x%x\n"
msgstr "porta do relógio ajustada para 0x%x\n"
-#: hwclock/cmos.c:205
+#: hwclock/cmos.c:209
msgid "funky TOY!\n"
msgstr "funky TOY!\n"
-#: hwclock/cmos.c:259
+#: hwclock/cmos.c:263
#, c-format
msgid "%s: atomic %s failed for 1000 iterations!"
msgstr "%s: %s atômico falhou por 1000 iterações!"
-#: hwclock/cmos.c:583
+#: hwclock/cmos.c:587
#, c-format
msgid "Cannot open /dev/port: %s"
msgstr "Não é possível abrir /dev/port: %s"
-#: hwclock/cmos.c:590
+#: hwclock/cmos.c:594
msgid "I failed to get permission because I didn't try.\n"
msgstr "Não consegui obter permissão porque não tentei.\n"
-#: hwclock/cmos.c:593
+#: hwclock/cmos.c:597
#, c-format
msgid "%s is unable to get I/O port access: the iopl(3) call failed.\n"
msgstr ""
"%s é incapaz de obter acesso à porta de E/S: a chamada iopl(3) falhou.\n"
-#: hwclock/cmos.c:596
+#: hwclock/cmos.c:600
msgid "Probably you need root privileges.\n"
msgstr "Provavelmente são necessários privilégios de root.\n"
-#: hwclock/hwclock.c:219
+#: hwclock/hwclock.c:223
#, c-format
msgid "Assuming hardware clock is kept in %s time.\n"
msgstr "Pressupondo que o relógio de hardware é mantido na hora %s.\n"
-#: hwclock/hwclock.c:220 hwclock/hwclock.c:314
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
msgid "UTC"
msgstr "UTC"
-#: hwclock/hwclock.c:220 hwclock/hwclock.c:313
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
msgid "local"
msgstr "local"
-#: hwclock/hwclock.c:297
+#: hwclock/hwclock.c:303
#, c-format
msgid "%s: Warning: unrecognized third line in adjtime file\n"
msgstr "%s: Aviso: a terceira linha do arquivo adjtime não foi reconhecida\n"
-#: hwclock/hwclock.c:299
+#: hwclock/hwclock.c:305
msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
msgstr "(Esperado: `UTC', `LOCAL' ou nada.)\n"
-#: hwclock/hwclock.c:308
+#: hwclock/hwclock.c:312
#, fuzzy, c-format
msgid "Last drift adjustment done at %ld seconds after 1969\n"
msgstr "Último ajuste de variação feito %d segundos após 1969\n"
-#: hwclock/hwclock.c:310
+#: hwclock/hwclock.c:314
#, fuzzy, c-format
msgid "Last calibration done at %ld seconds after 1969\n"
msgstr "Última calibração feita %d segundos após 1969\n"
-#: hwclock/hwclock.c:312
+#: hwclock/hwclock.c:316
#, c-format
msgid "Hardware clock is on %s time\n"
msgstr "O relógio de hardware está na hora %s\n"
-#: hwclock/hwclock.c:314
+#: hwclock/hwclock.c:318
msgid "unknown"
msgstr "desconhecida"
-#. -----------------------------------------------------------------------------
-#. 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.
-#.
-#. -----------------------------------------------------------------------------
-#: hwclock/hwclock.c:336
+#: hwclock/hwclock.c:342
msgid "Waiting for clock tick...\n"
msgstr "Aguardando tique do relógio...\n"
-#: hwclock/hwclock.c:340
+#: hwclock/hwclock.c:346
msgid "...got clock tick\n"
msgstr "... tique do relógio obtido\n"
-#: hwclock/hwclock.c:391
+#: hwclock/hwclock.c:399
#, c-format
msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
msgstr ""
"Valores inválidos no relógio de hardware: %4d/%.4d/%.2d %.2d:%.2d:%.2d\n"
-#: hwclock/hwclock.c:399
+#: hwclock/hwclock.c:407
#, c-format
msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
msgstr ""
"Hora do relógio de hardware: %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld segundos "
"desde 1969\n"
-#: hwclock/hwclock.c:427
+#: hwclock/hwclock.c:435
#, c-format
msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
msgstr "Hora lida do relógio de Hardware: %4d/%.2d/%.2d %02d:%02d:%02d\n"
-#: hwclock/hwclock.c:454
+#: hwclock/hwclock.c:462
#, fuzzy, c-format
msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
msgstr ""
"Configurando o relógio de hardware para %.2d:%.2d:%.2d = %d segundos desde "
"1969\n"
-#: hwclock/hwclock.c:460
+#: hwclock/hwclock.c:468
msgid "Clock not changed - testing only.\n"
msgstr "Relógio não alterado - apenas testando.\n"
-#: hwclock/hwclock.c:508
+#: hwclock/hwclock.c:516
#, c-format
msgid ""
"Time elapsed since reference time has been %.6f seconds.\n"
@@ -5108,7 +5329,7 @@ msgstr ""
"O tempo decorrido desde o horário de referência foi de %.6f segundos.\n"
" Atrasando mais para chegar ao próximo segundo cheio.\n"
-#: hwclock/hwclock.c:532
+#: hwclock/hwclock.c:540
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"
@@ -5117,21 +5338,21 @@ msgstr ""
"50º dia do mês) ou além do intervalo que podemos manipular (p.ex., ano "
"2095).\n"
-#: hwclock/hwclock.c:542
+#: hwclock/hwclock.c:550
#, c-format
msgid "%s %.6f seconds\n"
msgstr "%s %.6f segundos\n"
-#: hwclock/hwclock.c:576
+#: hwclock/hwclock.c:584
msgid "No --date option specified.\n"
msgstr "Não. Opção --date especificada\n"
-#: hwclock/hwclock.c:582
+#: hwclock/hwclock.c:590
#, fuzzy
msgid "--date argument too long\n"
msgstr "fsname nome muito longo"
-#: hwclock/hwclock.c:589
+#: hwclock/hwclock.c:597
msgid ""
"The value of the --date option is not a valid date.\n"
"In particular, it contains quotation marks.\n"
@@ -5139,22 +5360,22 @@ msgstr ""
"O valor da opção --date não é uma data válida.\n"
"Especificamente, ele contém aspas.\n"
-#: hwclock/hwclock.c:597
+#: hwclock/hwclock.c:605
#, c-format
msgid "Issuing date command: %s\n"
msgstr "Emitindo comando date: %s\n"
-#: hwclock/hwclock.c:601
+#: hwclock/hwclock.c:609
msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
msgstr ""
"Não foi possível executar o programa 'date' no shell /bin/sh: popen() falhou"
-#: hwclock/hwclock.c:609
+#: hwclock/hwclock.c:617
#, c-format
msgid "response from date command = %s\n"
msgstr "resposta do comando date = %s\n"
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:619
#, c-format
msgid ""
"The date command issued by %s returned unexpected results.\n"
@@ -5169,7 +5390,7 @@ msgstr ""
"A resposta foi:\n"
" %s\n"
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:631
#, c-format
msgid ""
"The date command issued by %s returned something other than an integer where "
@@ -5186,12 +5407,12 @@ msgstr ""
"A resposta foi:\n"
" %s\n"
-#: hwclock/hwclock.c:634
+#: hwclock/hwclock.c:642
#, fuzzy, c-format
msgid "date string %s equates to %ld seconds since 1969.\n"
msgstr "String de date %s equivale a %d segundos desde 1969.\n"
-#: hwclock/hwclock.c:666
+#: hwclock/hwclock.c:674
msgid ""
"The Hardware Clock does not contain a valid time, so we cannot set the "
"System Time from it.\n"
@@ -5199,34 +5420,34 @@ msgstr ""
"O relógio de hardware não contém uma hora válida. Em função disso, não é "
"possível configurar a hora do sistema a partir dele.\n"
-#: hwclock/hwclock.c:688
+#: hwclock/hwclock.c:696
msgid "Calling settimeofday:\n"
msgstr "Chamando settimeofday:\n"
-#: hwclock/hwclock.c:689
+#: hwclock/hwclock.c:697
#, c-format
msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
-#: hwclock/hwclock.c:691
+#: hwclock/hwclock.c:699
#, c-format
msgid "\ttz.tz_minuteswest = %d\n"
msgstr "\ttz.tz_minuteswest = %d\n"
-#: hwclock/hwclock.c:694
+#: hwclock/hwclock.c:702
msgid "Not setting system clock because running in test mode.\n"
msgstr ""
"O relógio do sistema não está sendo ajustado: executando em modo de teste.\n"
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:711
msgid "Must be superuser to set system clock.\n"
msgstr "É necessário ser superusuário para ajustar o relógio do sistema.\n"
-#: hwclock/hwclock.c:704
+#: hwclock/hwclock.c:714
msgid "settimeofday() failed"
msgstr "settimeofday() falhou"
-#: hwclock/hwclock.c:737
+#: hwclock/hwclock.c:744
msgid ""
"Not adjusting drift factor because the Hardware Clock previously contained "
"garbage.\n"
@@ -5234,7 +5455,16 @@ msgstr ""
"O fator de variação não está sendo ajustado porque o relógio de hardware "
"continha lixo anteriormente.\n"
-#: hwclock/hwclock.c:741
+#: hwclock/hwclock.c:749
+#, fuzzy
+msgid ""
+"Not adjusting drift factor because last calibration time is zero,\n"
+"so history is bad and calibration startover is necessary.\n"
+msgstr ""
+"O fator de variação não está sendo ajustado porque menos de um dia se passou "
+"desde a última calibração.\n"
+
+#: hwclock/hwclock.c:755
msgid ""
"Not adjusting drift factor because it has been less than a day since the "
"last calibration.\n"
@@ -5242,10 +5472,10 @@ msgstr ""
"O fator de variação não está sendo ajustado porque menos de um dia se passou "
"desde a última calibração.\n"
-#: hwclock/hwclock.c:750
-#, c-format
+#: hwclock/hwclock.c:803
+#, fuzzy, c-format
msgid ""
-"Clock drifted %d seconds in the past %d seconds in spite of a drift factor "
+"Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
"of %f seconds/day.\n"
"Adjusting drift factor by %f seconds/day\n"
msgstr ""
@@ -5253,23 +5483,23 @@ msgstr ""
"variação de %f segundos/dia.\n"
"Ajustando o fator de variação em %f segundos/dia.\n"
-#: hwclock/hwclock.c:801
+#: hwclock/hwclock.c:854
#, c-format
msgid "Time since last adjustment is %d seconds\n"
msgstr "O tempo desde o último ajuste é de %d segundos\n"
-#: hwclock/hwclock.c:803
+#: hwclock/hwclock.c:856
#, c-format
msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
msgstr ""
"É necessário inserir %d segundos e referenciar a hora de %.6f segundos "
"atrás\n"
-#: hwclock/hwclock.c:832
+#: hwclock/hwclock.c:885
msgid "Not updating adjtime file because of testing mode.\n"
msgstr "O arquivo adjtime não está sendo atualizado: modo de teste.\n"
-#: hwclock/hwclock.c:833
+#: hwclock/hwclock.c:886
#, c-format
msgid ""
"Would have written the following to %s:\n"
@@ -5278,37 +5508,37 @@ msgstr ""
"Teria gravado o seguinte em %s:\n"
"%s"
-#: hwclock/hwclock.c:857
+#: hwclock/hwclock.c:910
msgid "Drift adjustment parameters not updated.\n"
msgstr "Parâmetros de ajuste de variação não atualizados.\n"
-#: hwclock/hwclock.c:898
+#: hwclock/hwclock.c:951
msgid ""
"The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
msgstr ""
"O relógio de hardware não contém uma hora válida, portanto não é possível "
"ajustá-lo.\n"
-#: hwclock/hwclock.c:922
+#: hwclock/hwclock.c:983
msgid "Needed adjustment is less than one second, so not setting clock.\n"
msgstr ""
"O ajuste necessário é menor do que um segundo, portanto o relógio não será "
"ajustado.\n"
-#: hwclock/hwclock.c:948
+#: hwclock/hwclock.c:1009
#, c-format
msgid "Using %s.\n"
msgstr "Usando %s.\n"
-#: hwclock/hwclock.c:950
+#: hwclock/hwclock.c:1011
msgid "No usable clock interface found.\n"
msgstr "Não foi encontrada uma interface de relógio utilizável.\n"
-#: hwclock/hwclock.c:1045
+#: hwclock/hwclock.c:1107
msgid "Unable to set system clock.\n"
msgstr "Não é possível ajustar o relógio do sistema.\n"
-#: hwclock/hwclock.c:1076
+#: hwclock/hwclock.c:1137
msgid ""
"The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
"machine.\n"
@@ -5321,16 +5551,16 @@ msgstr ""
"assim, supõe-se que não está sendo executada em uma Alpha no momento). "
"Nenhuma ação foi realizada.\n"
-#: hwclock/hwclock.c:1085
+#: hwclock/hwclock.c:1146
msgid "Unable to get the epoch value from the kernel.\n"
msgstr "Não foi possível obter o valor de epoch do kernel.\n"
-#: hwclock/hwclock.c:1087
+#: hwclock/hwclock.c:1148
#, c-format
msgid "Kernel is assuming an epoch value of %lu\n"
msgstr "O kernel está pressupondo um valor de epoch de %lu\n"
-#: hwclock/hwclock.c:1090
+#: hwclock/hwclock.c:1151
msgid ""
"To set the epoch value, you must use the 'epoch' option to tell to what "
"value to set it.\n"
@@ -5338,16 +5568,16 @@ msgstr ""
"Para configurar o valor de epoch, é necessário usar a opção 'epoch' para "
"informar para que valor configurá-lo.\n"
-#: hwclock/hwclock.c:1093
+#: hwclock/hwclock.c:1154
#, c-format
msgid "Not setting the epoch to %d - testing only.\n"
msgstr "Epoch não configurado para %d; apenas testando.\n"
-#: hwclock/hwclock.c:1096
+#: hwclock/hwclock.c:1157
msgid "Unable to set the epoch value in the kernel.\n"
msgstr "Não é possível configurar o valor de epoch no kernel.\n"
-#: hwclock/hwclock.c:1125
+#: hwclock/hwclock.c:1191
#, fuzzy, c-format
msgid ""
"hwclock - query and set the hardware clock (RTC)\n"
@@ -5410,7 +5640,7 @@ msgstr ""
" --epoch=ano Especifica o ano inicial do valor \n"
" de epoch do relógio de hardware.\n"
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1218
msgid ""
" --jensen, --arc, --srm, --funky-toy\n"
" tell hwclock the type of alpha you have (see hwclock(8))\n"
@@ -5419,20 +5649,21 @@ msgstr ""
" informa a hwclock o tipo de Alpha que você tem (consulte "
"hwclock(8))\n"
-#: hwclock/hwclock.c:1257
+#: hwclock/hwclock.c:1392
#, c-format
msgid "%s takes no non-option arguments. You supplied %d.\n"
msgstr "%s não aceita argumentos que não sejam de opção. Você forneceu %d.\n"
-#: hwclock/hwclock.c:1267
+#: hwclock/hwclock.c:1398
+#, fuzzy
msgid ""
-"You have specified multiple function options.\n"
+"You have specified multiple functions.\n"
"You can only perform one function at a time.\n"
msgstr ""
"Você especificou múltiplas opções de função.\n"
"Você só pode executar uma função por vez.\n"
-#: hwclock/hwclock.c:1273
+#: hwclock/hwclock.c:1405
#, c-format
msgid ""
"%s: The --utc and --localtime options are mutually exclusive. You specified "
@@ -5441,7 +5672,7 @@ msgstr ""
"%s: As opções --utc e --localtime são mutuamente exclusivas. Você "
"especificou ambas.\n"
-#: hwclock/hwclock.c:1279
+#: hwclock/hwclock.c:1412
#, fuzzy, c-format
msgid ""
"%s: The --adjust and --noadjfile options are mutually exclusive. You "
@@ -5450,25 +5681,25 @@ msgstr ""
"%s: As opções --utc e --localtime são mutuamente exclusivas. Você "
"especificou ambas.\n"
-#: hwclock/hwclock.c:1285
+#: hwclock/hwclock.c:1419
#, c-format
msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
msgstr ""
-#: hwclock/hwclock.c:1298
+#: hwclock/hwclock.c:1433
msgid "No usable set-to time. Cannot set clock.\n"
msgstr ""
"Não há um horário para ajuste utilizável. Não é possível ajustar o relógio.\n"
-#: hwclock/hwclock.c:1313
+#: hwclock/hwclock.c:1449
msgid "Sorry, only the superuser can change the Hardware Clock.\n"
msgstr "Somente o superusuário pode alterar o relógio de hardware.\n"
-#: hwclock/hwclock.c:1317
+#: hwclock/hwclock.c:1454
msgid "Sorry, only the superuser can change the System Clock.\n"
msgstr "Somente o superusuário pode alterar o relógio de hardware.\n"
-#: hwclock/hwclock.c:1321
+#: hwclock/hwclock.c:1459
msgid ""
"Sorry, only the superuser can change the Hardware Clock epoch in the "
"kernel.\n"
@@ -5476,12 +5707,12 @@ msgstr ""
"Somente o superusuário pode alterar o epoch do relógio de hardware no "
"kernel.\n"
-#: hwclock/hwclock.c:1341
+#: hwclock/hwclock.c:1479
msgid "Cannot access the Hardware Clock via any known method.\n"
msgstr ""
"Não é possível acessar o Relógio de Hardware por nenhum método conhecido.\n"
-#: hwclock/hwclock.c:1344
+#: hwclock/hwclock.c:1483
msgid ""
"Use the --debug option to see the details of our search for an access "
"method.\n"
@@ -5489,97 +5720,92 @@ msgstr ""
"Use a opção --debug para consultar os detalhes de nossa busca por um método "
"de acesso.\n"
-#: hwclock/kd.c:42
+#: hwclock/kd.c:43
msgid "Waiting in loop for time from KDGHWCLK to change\n"
msgstr "Aguardando em laço até que a hora de KDGHWCLK mude.\n"
-#: hwclock/kd.c:45
+#: hwclock/kd.c:46
msgid "KDGHWCLK ioctl to read time failed"
msgstr "ioctl KDGHWCLK para ler a hora falhou"
-#: hwclock/kd.c:66 hwclock/rtc.c:174
+#: hwclock/kd.c:67 hwclock/rtc.c:187
msgid "Timed out waiting for time change.\n"
msgstr "Tempo esgotado enquanto aguardava a hora mudar.\n"
-#: hwclock/kd.c:70
+#: hwclock/kd.c:71
msgid "KDGHWCLK ioctl to read time failed in loop"
msgstr "ioctl KDGHWCLK para ler a hora falhou no laço"
-#: hwclock/kd.c:92
+#: hwclock/kd.c:93
#, fuzzy, c-format
msgid "ioctl() failed to read time from %s"
msgstr "ioctl() não conseguiu ler a hora de /dev/tty1"
-#: hwclock/kd.c:128
+#: hwclock/kd.c:129
msgid "ioctl KDSHWCLK failed"
msgstr "ioctl KDSHWCLK falhou"
-#: hwclock/kd.c:165
+#: hwclock/kd.c:166
#, fuzzy
msgid "Can't open /dev/tty1 or /dev/vc/1"
msgstr "Não foi possível abrir /dev/tty1"
-#: hwclock/kd.c:170
+#: hwclock/kd.c:171
msgid "KDGHWCLK ioctl failed"
msgstr "ioctl KDGHWCLK falhou"
-#: hwclock/rtc.c:136
+#: hwclock/rtc.c:115 hwclock/rtc.c:208
+#, c-format
+msgid "open() of %s failed"
+msgstr "open() de %s falhou"
+
+#: hwclock/rtc.c:149
#, c-format
msgid "ioctl() to %s to read the time failed.\n"
msgstr "ioctl() para %s para ler a hora falhou.\n"
-#: hwclock/rtc.c:158
+#: hwclock/rtc.c:171
#, c-format
msgid "Waiting in loop for time from %s to change\n"
msgstr "Aguardando em laço até que a hora de %s mude.\n"
-#: hwclock/rtc.c:195 hwclock/rtc.c:250
-#, c-format
-msgid "open() of %s failed"
-msgstr "open() de %s falhou"
-
-#: hwclock/rtc.c:213
+#: hwclock/rtc.c:226
#, c-format
msgid "%s does not have interrupt functions. "
msgstr "%s não possui funções de interrupção. "
-#: hwclock/rtc.c:222
+#: hwclock/rtc.c:235
#, c-format
msgid "read() to %s to wait for clock tick failed"
msgstr "read() para %s para aguardar tique do relógio falhou"
-#: hwclock/rtc.c:231
+#: hwclock/rtc.c:244
#, c-format
msgid "ioctl() to %s to turn off update interrupts failed"
msgstr "ioctl() para %s para desligar interrupções de atualização falhou"
-#: hwclock/rtc.c:234
+#: hwclock/rtc.c:247
#, c-format
msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
msgstr ""
"ioctl() para %s para ligar interrupções de atualização falhou inesperadamente"
-#: hwclock/rtc.c:274 hwclock/rtc.c:358 hwclock/rtc.c:404
-#, c-format
-msgid "Unable to open %s"
-msgstr "Não foi possível abrir %s"
-
-#: hwclock/rtc.c:300
+#: hwclock/rtc.c:306
#, c-format
msgid "ioctl() to %s to set the time failed.\n"
msgstr "ioctl() para %s para ajustar a hora falhou.\n"
-#: hwclock/rtc.c:306
+#: hwclock/rtc.c:312
#, c-format
msgid "ioctl(%s) was successful.\n"
msgstr "ioctl(%s) teve êxito.\n"
-#: hwclock/rtc.c:335
+#: hwclock/rtc.c:341
#, c-format
msgid "Open of %s failed"
msgstr "A abertura de %s falhou"
-#: hwclock/rtc.c:353 hwclock/rtc.c:399
+#: hwclock/rtc.c:359 hwclock/rtc.c:405
#, c-format
msgid ""
"To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
@@ -5590,12 +5816,17 @@ msgstr ""
"dispositivo 'rtc' do Linux, através do arquivo de dispositivo especial %s. "
"No entanto, esse arquivo não existe neste sistema.\n"
-#: hwclock/rtc.c:365
+#: hwclock/rtc.c:364 hwclock/rtc.c:410
+#, c-format
+msgid "Unable to open %s"
+msgstr "Não foi possível abrir %s"
+
+#: hwclock/rtc.c:371
#, c-format
msgid "ioctl(RTC_EPOCH_READ) to %s failed"
msgstr "ioctl(RTC_EPOCH_READ) para %s falhou"
-#: hwclock/rtc.c:371
+#: hwclock/rtc.c:377
#, c-format
msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
msgstr "lemos epoch %ld de %s com ioctl RTC_EPOCH_READ.\n"
@@ -5603,58 +5834,28 @@ msgstr "lemos epoch %ld de %s com ioctl RTC_EPOCH_READ.\n"
#. kernel would not accept this epoch value
#. Hmm - bad habit, deciding not to do what the user asks
#. just because one believes that the kernel might not like it.
-#: hwclock/rtc.c:391
+#: hwclock/rtc.c:397
#, c-format
msgid "The epoch value may not be less than 1900. You requested %ld\n"
msgstr "O valor de epoch não pode ser menor que 1900. Você solicitou %ld.\n"
-#: hwclock/rtc.c:409
+#: hwclock/rtc.c:415
#, c-format
msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
msgstr "Configurando epoch como %ld com ioctl RTC_EPOCH_SET para %s.\n"
-#: hwclock/rtc.c:414
+#: hwclock/rtc.c:420
#, c-format
msgid ""
"The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
msgstr ""
"O driver de dispositivo do kernel para %s não possui o ioctl RTC_EPOCH_SET.\n"
-#: hwclock/rtc.c:417
+#: hwclock/rtc.c:423
#, c-format
msgid "ioctl(RTC_EPOCH_SET) to %s failed"
msgstr "ioctl(RTC_EPOCH_SET) para %s falhou"
-#: hwclock/shhopt.c:255 hwclock/shhopt.c:281
-#, c-format
-msgid "invalid number `%s'\n"
-msgstr "número `%s' inválido\n"
-
-#: hwclock/shhopt.c:258 hwclock/shhopt.c:284
-#, c-format
-msgid "number `%s' to `%s' out of range\n"
-msgstr "número `%s' a `%s' fora do intervalo\n"
-
-#: hwclock/shhopt.c:398
-#, c-format
-msgid "unrecognized option `%s'\n"
-msgstr "opção `%s' não reconhecida\n"
-
-#: hwclock/shhopt.c:411 hwclock/shhopt.c:449
-#, c-format
-msgid "option `%s' requires an argument\n"
-msgstr "a opção `%s' exige um argumento\n"
-
-#: hwclock/shhopt.c:417
-#, c-format
-msgid "option `%s' doesn't allow an argument\n"
-msgstr "a opção `%s' não permite um argumento\n"
-
-#: hwclock/shhopt.c:439
-#, c-format
-msgid "unrecognized option `-%c'\n"
-msgstr "opção `-%c' não reconhecida\n"
-
#: login-utils/agetty.c:312
msgid "calling open_tty\n"
msgstr "calling open_tty\n"
@@ -6688,7 +6889,7 @@ msgstr "abertura do diretório falhou\n"
msgid "fork failed\n"
msgstr "o fork falhou\n"
-#: login-utils/simpleinit.c:512 text-utils/more.c:1705
+#: login-utils/simpleinit.c:512 text-utils/more.c:1706
msgid "exec failed\n"
msgstr "exec falhou\n"
@@ -7484,163 +7685,163 @@ msgstr "[mntent]: linha %d em %s tem %s inválido(a)\n"
msgid "; rest of file ignored"
msgstr "; resto do arquivo ignorado"
-#: mount/mount.c:379
+#: mount/mount.c:381
#, c-format
msgid "mount: according to mtab, %s is already mounted on %s"
msgstr "mount: de acordo com mtab, %s já está montado em %s"
-#: mount/mount.c:383
+#: mount/mount.c:385
#, c-format
msgid "mount: according to mtab, %s is mounted on %s"
msgstr "mount: de acordo com mtab, %s está montado em %s"
-#: mount/mount.c:404
+#: mount/mount.c:406
#, c-format
msgid "mount: can't open %s for writing: %s"
msgstr "mount: não foi possível abrir %s para gravação: %s"
-#: mount/mount.c:419 mount/mount.c:638
+#: mount/mount.c:421 mount/mount.c:640
#, c-format
msgid "mount: error writing %s: %s"
msgstr "mount: erro ao gravar %s: %s"
-#: mount/mount.c:426
+#: mount/mount.c:428
#, c-format
msgid "mount: error changing mode of %s: %s"
msgstr "mount: erro ao alterar modo de %s: %s"
-#: mount/mount.c:472
+#: mount/mount.c:474
#, c-format
msgid "%s looks like swapspace - not mounted"
msgstr "%s parece espaço de permuta - não montado"
-#: mount/mount.c:532
+#: mount/mount.c:534
msgid "mount failed"
msgstr "mount falhou"
-#: mount/mount.c:534
+#: mount/mount.c:536
#, c-format
msgid "mount: only root can mount %s on %s"
msgstr "mount: somente o root pode montar %s em %s"
-#: mount/mount.c:562
+#: mount/mount.c:564
msgid "mount: loop device specified twice"
msgstr "mount: dispositivo de laço especificado duas vezes"
-#: mount/mount.c:567
+#: mount/mount.c:569
msgid "mount: type specified twice"
msgstr "mount: tipo especificado duas vezes"
-#: mount/mount.c:579
+#: mount/mount.c:581
msgid "mount: skipping the setup of a loop device\n"
msgstr "mount: ignorando a configuração de um dispositivo de laço\n"
-#: mount/mount.c:588
+#: mount/mount.c:590
#, c-format
msgid "mount: going to use the loop device %s\n"
msgstr "mount: será usado o dispositivo de laço %s\n"
-#: mount/mount.c:592
+#: mount/mount.c:594
msgid "mount: failed setting up loop device\n"
msgstr "mount: falha ao configurar dispositivo de laço\n"
-#: mount/mount.c:596
+#: mount/mount.c:598
msgid "mount: setup loop device successfully\n"
msgstr "mount: configuração de dispositivo de laço realizada com sucesso\n"
-#: mount/mount.c:633
+#: mount/mount.c:635
#, c-format
msgid "mount: can't open %s: %s"
msgstr "mount: não foi possível abrir %s: %s"
-#: mount/mount.c:656
+#: mount/mount.c:658
#, fuzzy, c-format
msgid "mount: cannot open %s for setting speed"
msgstr "mount: não foi possível abrir %s para configuração da velocidade"
-#: mount/mount.c:659
+#: mount/mount.c:661
#, c-format
msgid "mount: cannot set speed: %s"
msgstr "mount: não foi possível configurar velocidade: %s"
-#: mount/mount.c:720 mount/mount.c:1265
+#: mount/mount.c:722 mount/mount.c:1295
#, c-format
msgid "mount: cannot fork: %s"
msgstr "mount: não foi possível realizar fork: %s"
-#: mount/mount.c:800
+#: mount/mount.c:802
msgid "mount: this version was compiled without support for the type `nfs'"
msgstr "mount: esta versão foi compilada sem suporte ao tipo `nfs'"
-#: mount/mount.c:839
+#: mount/mount.c:841
msgid "mount: failed with nfs mount version 4, trying 3..\n"
msgstr ""
"mount: falhou com o mount do nfs versão 4, tentando com o 3..\n"
" \n"
-#: mount/mount.c:850
+#: mount/mount.c:852
msgid ""
"mount: I could not determine the filesystem type, and none was specified"
msgstr ""
"mount: não foi possível determinar o tipo do sistema de arquivos e nenhum "
"foi especificado"
-#: mount/mount.c:853
+#: mount/mount.c:855
msgid "mount: you must specify the filesystem type"
msgstr "mount: você precisa especificar o tipo do sistema de arquivos"
#. should not happen
-#: mount/mount.c:856
+#: mount/mount.c:858
msgid "mount: mount failed"
msgstr "mount: a montagem falhou"
-#: mount/mount.c:862 mount/mount.c:897
+#: mount/mount.c:864 mount/mount.c:899
#, c-format
msgid "mount: mount point %s is not a directory"
msgstr "mount: o ponto de montagem %s não é um diretório"
-#: mount/mount.c:864
+#: mount/mount.c:866
msgid "mount: permission denied"
msgstr "mount: permissão negada"
-#: mount/mount.c:866
+#: mount/mount.c:868
msgid "mount: must be superuser to use mount"
msgstr "mount: é necessário ser superusuário para montar"
#. heuristic: if /proc/version exists, then probably proc is mounted
#. proc mounted?
-#: mount/mount.c:870 mount/mount.c:874
+#: mount/mount.c:872 mount/mount.c:876
#, c-format
msgid "mount: %s is busy"
msgstr "mount: %s está ocupado"
#. no
#. yes, don't mention it
-#: mount/mount.c:876
+#: mount/mount.c:878
msgid "mount: proc already mounted"
msgstr "mount: proc já montado"
-#: mount/mount.c:878
+#: mount/mount.c:880
#, c-format
msgid "mount: %s already mounted or %s busy"
msgstr "mount: %s já montado ou %s ocupado"
-#: mount/mount.c:884
+#: mount/mount.c:886
#, c-format
msgid "mount: mount point %s does not exist"
msgstr "mount: o ponto de montagem %s não existe"
-#: mount/mount.c:886
+#: mount/mount.c:888
#, c-format
msgid "mount: mount point %s is a symbolic link to nowhere"
msgstr "mount: o ponto de montagem %s é um vínculo simbólico para lugar algum"
-#: mount/mount.c:889
+#: mount/mount.c:891
#, c-format
msgid "mount: special device %s does not exist"
msgstr "mount: o dispositivo especial %s não existe"
-#: mount/mount.c:899
+#: mount/mount.c:901
#, c-format
msgid ""
"mount: special device %s does not exist\n"
@@ -7649,12 +7850,12 @@ msgstr ""
"mount: o dispositivo especial %s não existe\n"
" (um prefixo de caminho não é um diretório)\n"
-#: mount/mount.c:912
+#: mount/mount.c:914
#, c-format
msgid "mount: %s not mounted already, or bad option"
msgstr "mount: %s já não está montado ou opção inválida"
-#: mount/mount.c:914
+#: mount/mount.c:916
#, c-format
msgid ""
"mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -7664,35 +7865,35 @@ msgstr ""
"inválido em %s,\n"
" ou número excessivo de sistemas de arquivos montados"
-#: mount/mount.c:948
+#: mount/mount.c:950
msgid "mount table full"
msgstr "tabela de montagem cheia"
-#: mount/mount.c:950
+#: mount/mount.c:952
#, c-format
msgid "mount: %s: can't read superblock"
msgstr "mount: %s: não foi possível ler o superbloco"
-#: mount/mount.c:954
+#: mount/mount.c:956
#, c-format
msgid "mount: %s: unknown device"
msgstr "mount: %s: dispositivo de blocos desconhecido"
-#: mount/mount.c:959
+#: mount/mount.c:961
#, c-format
msgid "mount: fs type %s not supported by kernel"
msgstr "mount: o tipo de sistema de arquivos %s não é suportado pelo kernel"
-#: mount/mount.c:971
+#: mount/mount.c:973
#, c-format
msgid "mount: probably you meant %s"
msgstr "mount: provavelmente você queria dizer %s"
-#: mount/mount.c:973
+#: mount/mount.c:975
msgid "mount: maybe you meant iso9660 ?"
msgstr "mount: talvez você quisesse dizer iso9660?"
-#: mount/mount.c:976
+#: mount/mount.c:978
#, c-format
msgid "mount: %s has wrong device number or fs type %s not supported"
msgstr ""
@@ -7700,12 +7901,12 @@ msgstr ""
"arquivos %s não é suportado"
#. strange ...
-#: mount/mount.c:982
+#: mount/mount.c:984
#, c-format
msgid "mount: %s is not a block device, and stat fails?"
msgstr "mount: %s não é um dispositivo de blocos e stat falha?"
-#: mount/mount.c:984
+#: mount/mount.c:986
#, c-format
msgid ""
"mount: the kernel does not recognize %s as a block device\n"
@@ -7714,93 +7915,99 @@ msgstr ""
"mount: o kernel não reconhece %s como dispositivo de blocos\n"
" (talvez `insmod driver'?)"
-#: mount/mount.c:987
+#: mount/mount.c:989
#, c-format
msgid "mount: %s is not a block device (maybe try `-o loop'?)"
msgstr "mount: %s não é um dispositivo de blocos (talvez tentar `-o loop'?)"
-#: mount/mount.c:990
+#: mount/mount.c:992
#, c-format
msgid "mount: %s is not a block device"
msgstr "mount: %s não é um dispositivo de blocos"
-#: mount/mount.c:993
+#: mount/mount.c:995
#, c-format
msgid "mount: %s is not a valid block device"
msgstr "mount: %s não é um dispositivo de blocos válido"
#. pre-linux 1.1.38, 1.1.41 and later
#. linux 1.1.38 and later
-#: mount/mount.c:996
+#: mount/mount.c:998
msgid "block device "
msgstr "dispositivo de blocos "
-#: mount/mount.c:998
+#: mount/mount.c:1000
#, c-format
msgid "mount: cannot mount %s%s read-only"
msgstr "mount: não foi possível montar %s%s somente para leitura"
-#: mount/mount.c:1002
+#: mount/mount.c:1004
#, c-format
msgid "mount: %s%s is write-protected but explicit `-w' flag given"
msgstr "mount: %s%s é protegido contra gravação mas a opção -w foi passada"
-#: mount/mount.c:1018
+#: mount/mount.c:1020
#, c-format
msgid "mount: %s%s is write-protected, mounting read-only"
msgstr "mount: %s%s é protegido contra gravação; montando somente para leitura"
-#: mount/mount.c:1104
+#: mount/mount.c:1107
#, c-format
msgid "mount: the label %s occurs on both %s and %s\n"
msgstr ""
-#: mount/mount.c:1108
+#: mount/mount.c:1111
#, fuzzy, c-format
msgid "mount: %s duplicate - not mounted"
msgstr "umount: %s: não montado"
-#: mount/mount.c:1118
+#: mount/mount.c:1121
#, c-format
msgid "mount: going to mount %s by %s\n"
msgstr "mount: montando %s por %s\n"
-#: mount/mount.c:1119
+#: mount/mount.c:1122
msgid "UUID"
msgstr "UUID"
-#: mount/mount.c:1119
+#: mount/mount.c:1122
msgid "label"
msgstr "rótulo"
-#: mount/mount.c:1121 mount/mount.c:1521
+#: mount/mount.c:1124 mount/mount.c:1555
msgid "mount: no such partition found"
msgstr "mount: tal partição não foi encontrada"
-#: mount/mount.c:1129
+#: mount/mount.c:1132
msgid "mount: no type was given - I'll assume nfs because of the colon\n"
msgstr ""
"mount: nenhum tipo foi fornecido - supondo nfs por causa dos dois-pontos\n"
+#: mount/mount.c:1137
+#, fuzzy
+msgid "mount: no type was given - I'll assume smb because of the // prefix\n"
+msgstr ""
+"mount: nenhum tipo foi fornecido - supondo nfs por causa dos dois-pontos\n"
+
#.
#. * Retry in the background.
#.
-#: mount/mount.c:1145
+#: mount/mount.c:1153
#, c-format
msgid "mount: backgrounding \"%s\"\n"
msgstr "mount: tentando montar em segundo plano \"%s\"\n"
-#: mount/mount.c:1156
+#: mount/mount.c:1164
#, c-format
msgid "mount: giving up \"%s\"\n"
msgstr "mount: desistindo de \"%s\"\n"
-#: mount/mount.c:1216
+#: mount/mount.c:1240
#, c-format
msgid "mount: %s already mounted on %s\n"
msgstr "mount: %s já montado em %s\n"
-#: mount/mount.c:1335
+#: mount/mount.c:1369
#, fuzzy
msgid ""
"Usage: mount -V : print version\n"
@@ -7847,40 +8054,40 @@ msgstr ""
"Outras opções: [-nfFrsvw] [-o opções].\n"
"Para mais detalhes, consulte `man 8 mount'.\n"
-#: mount/mount.c:1497
+#: mount/mount.c:1531
msgid "mount: only root can do that"
msgstr "mount: operação exclusiva de root"
-#: mount/mount.c:1502
+#: mount/mount.c:1536
#, c-format
msgid "mount: no %s found - creating it..\n"
msgstr "mount: nenhum %s encontrado - criando-o...\n"
-#: mount/mount.c:1516
+#: mount/mount.c:1550
#, c-format
msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
msgstr ""
-#: mount/mount.c:1523
+#: mount/mount.c:1557
#, c-format
msgid "mount: mounting %s\n"
msgstr "mount: montando %s\n"
-#: mount/mount.c:1532
+#: mount/mount.c:1566
msgid "nothing was mounted"
msgstr ""
-#: mount/mount.c:1547
+#: mount/mount.c:1581
#, c-format
msgid "mount: cannot find %s in %s"
msgstr "mount: não foi possível localizar %s em %s"
-#: mount/mount.c:1562
+#: mount/mount.c:1596
#, c-format
msgid "mount: can't find %s in %s or %s"
msgstr "mount: não foi possível localizar %s em %s ou %s"
-#: mount/mount_by_label.c:169
+#: mount/mount_by_label.c:199
#, c-format
msgid ""
"mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
@@ -7888,35 +8095,35 @@ msgstr ""
"mount: não foi possível abrir %s - conversões de UUID e LABEL não podem ser "
"feitas\n"
-#: mount/mount_by_label.c:295
+#: mount/mount_by_label.c:325
msgid "mount: bad UUID"
msgstr "mount: UUID inválida"
-#: mount/mount_guess_fstype.c:487
+#: mount/mount_guess_fstype.c:482
#, fuzzy
msgid "mount: error while guessing filesystem type\n"
msgstr "mount: você precisa especificar o tipo do sistema de arquivos"
-#: mount/mount_guess_fstype.c:496
+#: mount/mount_guess_fstype.c:491
#, c-format
msgid "mount: you didn't specify a filesystem type for %s\n"
msgstr "mount: não foi especificado um tipo de sistema de arquivos para %s\n"
-#: mount/mount_guess_fstype.c:499
+#: mount/mount_guess_fstype.c:494
#, c-format
msgid " I will try all types mentioned in %s or %s\n"
msgstr " experimentarei todos os tipos mencionados em %s ou %s\n"
-#: mount/mount_guess_fstype.c:502
+#: mount/mount_guess_fstype.c:497
msgid " and it looks like this is swapspace\n"
msgstr " e parece ser um espaço de permuta\n"
-#: mount/mount_guess_fstype.c:504
+#: mount/mount_guess_fstype.c:499
#, c-format
msgid " I will try type %s\n"
msgstr " experimentarei o tipo %s\n"
-#: mount/mount_guess_fstype.c:592
+#: mount/mount_guess_fstype.c:587
#, c-format
msgid "Trying %s\n"
msgstr "Experimentando %s\n"
@@ -8010,7 +8217,7 @@ msgstr "valor de retorno de status de nfs desconhecido: %d"
msgid "bug in xstrndup call"
msgstr "erro na chamada a xstrndup"
-#: mount/swapon.c:51
+#: mount/swapon.c:56
#, c-format
msgid ""
"usage: %s [-hV]\n"
@@ -8023,27 +8230,43 @@ msgstr ""
" %s [-v] [-p prioridade] especial ...\n"
" %s [-s]\n"
-#: mount/swapon.c:88
+#: mount/swapon.c:66
+#, fuzzy, c-format
+msgid ""
+"usage: %s [-hV]\n"
+" %s -a [-v]\n"
+" %s [-v] special ...\n"
+msgstr ""
+"Uso: %s [-hV]\n"
+" %s -a [-v]\n"
+" %s [-v] [-p prioridade] especial ...\n"
+" %s [-s]\n"
+
+#: mount/swapon.c:170 mount/swapon.c:234
#, c-format
msgid "%s on %s\n"
msgstr "%s em %s\n"
-#: mount/swapon.c:93
+#: mount/swapon.c:174
#, c-format
msgid "swapon: cannot stat %s: %s\n"
msgstr "swapon: não foi possível stat %s: %s\n"
-#: mount/swapon.c:105
+#: mount/swapon.c:185
#, fuzzy, c-format
msgid "swapon: warning: %s has insecure permissions %04o, %04o suggested\n"
msgstr "swapon: aviso: %s possui permissões inseguras %04o; sugere-se 0600\n"
-#: mount/swapon.c:115
+#: mount/swapon.c:197
#, c-format
msgid "swapon: Skipping file %s - it appears to have holes.\n"
msgstr "swapon: ignorando arquivo %s - ele parece ter buracos.\n"
-#: mount/swapon.c:222
+#: mount/swapon.c:240
+msgid "Not superuser.\n"
+msgstr ""
+
+#: mount/swapon.c:298 mount/swapon.c:386
#, c-format
msgid "%s: cannot open %s: %s\n"
msgstr "%s: não foi possível abrir %s: %s\n"
@@ -8419,28 +8642,28 @@ msgstr "%s em %s\n"
msgid "%s: unknown argument: %s\n"
msgstr "%s: sinal desconhecido %s\n"
-#: sys-utils/ipcs.c:122
+#: sys-utils/ipcs.c:121
#, c-format
msgid "usage : %s -asmq -tclup \n"
msgstr "Uso : %s -asmq -tclup \n"
-#: sys-utils/ipcs.c:123
+#: sys-utils/ipcs.c:122
#, c-format
msgid "\t%s [-s -m -q] -i id\n"
msgstr "\t%s [-s -m -q] -i id\n"
-#: sys-utils/ipcs.c:124
+#: sys-utils/ipcs.c:123
#, c-format
msgid "\t%s -h for help.\n"
msgstr "\t%s -h para ajuda.\n"
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:129
#, fuzzy, c-format
msgid ""
"%s provides information on ipc facilities for which you have read access.\n"
msgstr "%s fornece informações sobre recursos do ipc para"
-#: sys-utils/ipcs.c:132
+#: sys-utils/ipcs.c:131
msgid ""
"Resource Specification:\n"
"\t-m : shared_mem\n"
@@ -8450,7 +8673,7 @@ msgstr ""
"\t-m : memória compartilhada\n"
"\t-q : mensagens\n"
-#: sys-utils/ipcs.c:133
+#: sys-utils/ipcs.c:132
msgid ""
"\t-s : semaphores\n"
"\t-a : all (default)\n"
@@ -8458,7 +8681,7 @@ msgstr ""
"\t-s : semáforos\n"
"\t-a : tudo (padrão)\n"
-#: sys-utils/ipcs.c:134
+#: sys-utils/ipcs.c:133
msgid ""
"Output Format:\n"
"\t-t : time\n"
@@ -8470,7 +8693,7 @@ msgstr ""
"\t-p : pid\n"
"\t-c : criador\n"
-#: sys-utils/ipcs.c:135
+#: sys-utils/ipcs.c:134
msgid ""
"\t-l : limits\n"
"\t-u : summary\n"
@@ -8478,378 +8701,378 @@ msgstr ""
"\t-l : limites\n"
"\t-u : resumo\n"
-#: sys-utils/ipcs.c:136
+#: sys-utils/ipcs.c:135
msgid "-i id [-s -q -m] : details on resource identified by id\n"
msgstr "-i id [-s -q -m] : detalhes sobre o recurso identificado por id\n"
-#: sys-utils/ipcs.c:268
+#: sys-utils/ipcs.c:267
msgid "kernel not configured for shared memory\n"
msgstr "o kernel não está configurado para memória compartilhada\n"
-#: sys-utils/ipcs.c:274
+#: sys-utils/ipcs.c:273
msgid "------ Shared Memory Limits --------\n"
msgstr "- Limites da memória compartilhada -\n"
#. glibc 2.1.3 and all earlier libc's have ints as fields
#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
-#: sys-utils/ipcs.c:279
+#: sys-utils/ipcs.c:278
#, c-format
msgid "max number of segments = %ld\n"
msgstr "número máximo de segmentos: %ld\n"
-#: sys-utils/ipcs.c:281
+#: sys-utils/ipcs.c:280
#, c-format
msgid "max seg size (kbytes) = %ld\n"
msgstr "tamanho máximo do segmento (Kb): %ld\n"
-#: sys-utils/ipcs.c:283
+#: sys-utils/ipcs.c:282
#, c-format
msgid "max total shared memory (kbytes) = %ld\n"
msgstr "memória compartilhada total máxima (Kb): %ld\n"
-#: sys-utils/ipcs.c:285
+#: sys-utils/ipcs.c:284
#, c-format
msgid "min seg size (bytes) = %ld\n"
msgstr "tamanho mínimo do segmento (bytes): %ld\n"
-#: sys-utils/ipcs.c:290
+#: sys-utils/ipcs.c:289
msgid "------ Shared Memory Status --------\n"
msgstr "- Status da memória compartilhada -\n"
-#: sys-utils/ipcs.c:291
+#: sys-utils/ipcs.c:290
#, c-format
msgid "segments allocated %d\n"
msgstr "segmentos alocados: %d\n"
-#: sys-utils/ipcs.c:292
+#: sys-utils/ipcs.c:291
#, c-format
msgid "pages allocated %ld\n"
msgstr "páginas alocadas %ld\n"
-#: sys-utils/ipcs.c:293
+#: sys-utils/ipcs.c:292
#, c-format
msgid "pages resident %ld\n"
msgstr "páginas residentes: %ld\n"
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:293
#, c-format
msgid "pages swapped %ld\n"
msgstr "páginas permutadas: %ld\n"
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:294
#, c-format
msgid "Swap performance: %ld attempts\t %ld successes\n"
msgstr "Desempenho de permuta: %ld tentativas\t %ld sucessos\n"
-#: sys-utils/ipcs.c:300
+#: sys-utils/ipcs.c:299
msgid "------ Shared Memory Segment Creators/Owners --------\n"
msgstr "Criadores/donos de segmentos de memória compartilhada\n"
-#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:300 sys-utils/ipcs.c:417 sys-utils/ipcs.c:516
#, fuzzy, c-format
msgid "%-10s %-10s %-10s %-10s %-10s %-10s\n"
msgstr "%-10s%-10s%-10s%-10s%-10s%-10s\n"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:308 sys-utils/ipcs.c:315
-#: sys-utils/ipcs.c:321 sys-utils/ipcs.c:425
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:307 sys-utils/ipcs.c:314
+#: sys-utils/ipcs.c:320 sys-utils/ipcs.c:424
msgid "shmid"
msgstr "shmid"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:321 sys-utils/ipcs.c:419
-#: sys-utils/ipcs.c:434 sys-utils/ipcs.c:519 sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:320 sys-utils/ipcs.c:418
+#: sys-utils/ipcs.c:433 sys-utils/ipcs.c:517 sys-utils/ipcs.c:535
msgid "perms"
msgstr "perms"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:517
msgid "cuid"
msgstr "cuid"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:517
msgid "cgid"
msgstr "cgid"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:517
msgid "uid"
msgstr "uid"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:517
msgid "gid"
msgstr "gid"
-#: sys-utils/ipcs.c:306
+#: sys-utils/ipcs.c:305
msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
msgstr "Horários de anexação/destacamento/alteração da memória compartilhada\n"
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:306
#, fuzzy, c-format
msgid "%-10s %-10s %-20s %-20s %-20s\n"
msgstr "%-10s%-10s %-20s%-20s%-20s\n"
-#: sys-utils/ipcs.c:308 sys-utils/ipcs.c:315 sys-utils/ipcs.c:321
-#: sys-utils/ipcs.c:425 sys-utils/ipcs.c:434 sys-utils/ipcs.c:525
-#: sys-utils/ipcs.c:531 sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:314 sys-utils/ipcs.c:320
+#: sys-utils/ipcs.c:424 sys-utils/ipcs.c:433 sys-utils/ipcs.c:523
+#: sys-utils/ipcs.c:529 sys-utils/ipcs.c:535
msgid "owner"
msgstr "proprietário"
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:307
msgid "attached"
msgstr "anexado"
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:307
msgid "detached"
msgstr "destacado"
-#: sys-utils/ipcs.c:309
+#: sys-utils/ipcs.c:308
msgid "changed"
msgstr "alterado"
-#: sys-utils/ipcs.c:313
+#: sys-utils/ipcs.c:312
msgid "------ Shared Memory Creator/Last-op --------\n"
msgstr "Criador/última op da memória compartilhada\n"
-#: sys-utils/ipcs.c:314 sys-utils/ipcs.c:530
+#: sys-utils/ipcs.c:313 sys-utils/ipcs.c:528
#, fuzzy, c-format
msgid "%-10s %-10s %-10s %-10s\n"
msgstr "%-10s%-10s%-10s%-10s\n"
-#: sys-utils/ipcs.c:315
+#: sys-utils/ipcs.c:314
msgid "cpid"
msgstr "cpid"
-#: sys-utils/ipcs.c:315
+#: sys-utils/ipcs.c:314
msgid "lpid"
msgstr "lpid"
-#: sys-utils/ipcs.c:319
+#: sys-utils/ipcs.c:318
msgid "------ Shared Memory Segments --------\n"
msgstr "- Segmentos da memória compartilhada -\n"
-#: sys-utils/ipcs.c:320
+#: sys-utils/ipcs.c:319
#, fuzzy, c-format
msgid "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n"
msgstr "%-10s%-10s%-10s%-10s%-10s%-10s%-12s\n"
-#: sys-utils/ipcs.c:321 sys-utils/ipcs.c:434 sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:320 sys-utils/ipcs.c:433 sys-utils/ipcs.c:535
msgid "key"
msgstr "chave"
-#: sys-utils/ipcs.c:321
+#: sys-utils/ipcs.c:320
msgid "bytes"
msgstr "bytes"
-#: sys-utils/ipcs.c:322
+#: sys-utils/ipcs.c:321
msgid "nattch"
msgstr "nattch"
-#: sys-utils/ipcs.c:322 sys-utils/ipcs.c:435
+#: sys-utils/ipcs.c:321
msgid "status"
msgstr "status"
-#: sys-utils/ipcs.c:343 sys-utils/ipcs.c:345 sys-utils/ipcs.c:347
-#: sys-utils/ipcs.c:456 sys-utils/ipcs.c:458 sys-utils/ipcs.c:558
-#: sys-utils/ipcs.c:560 sys-utils/ipcs.c:562 sys-utils/ipcs.c:615
-#: sys-utils/ipcs.c:617 sys-utils/ipcs.c:646 sys-utils/ipcs.c:648
-#: sys-utils/ipcs.c:650 sys-utils/ipcs.c:674
+#: sys-utils/ipcs.c:342 sys-utils/ipcs.c:344 sys-utils/ipcs.c:346
+#: sys-utils/ipcs.c:455 sys-utils/ipcs.c:457 sys-utils/ipcs.c:556
+#: sys-utils/ipcs.c:558 sys-utils/ipcs.c:560 sys-utils/ipcs.c:613
+#: sys-utils/ipcs.c:615 sys-utils/ipcs.c:644 sys-utils/ipcs.c:646
+#: sys-utils/ipcs.c:648 sys-utils/ipcs.c:672
#, fuzzy
msgid "Not set"
msgstr "Não definido\n"
-#: sys-utils/ipcs.c:372
+#: sys-utils/ipcs.c:371
msgid "dest"
msgstr "dest"
-#: sys-utils/ipcs.c:373
+#: sys-utils/ipcs.c:372
msgid "locked"
msgstr "bloqueado"
-#: sys-utils/ipcs.c:393
+#: sys-utils/ipcs.c:392
msgid "kernel not configured for semaphores\n"
msgstr "o kernel não está configurado para semáforos\n"
-#: sys-utils/ipcs.c:399
+#: sys-utils/ipcs.c:398
msgid "------ Semaphore Limits --------\n"
msgstr "------ Limites de semáforo ------\n"
-#: sys-utils/ipcs.c:403
+#: sys-utils/ipcs.c:402
#, c-format
msgid "max number of arrays = %d\n"
msgstr "número máximo de arrays: %d\n"
-#: sys-utils/ipcs.c:404
+#: sys-utils/ipcs.c:403
#, c-format
msgid "max semaphores per array = %d\n"
msgstr "máximo de semáforos por array: %d\n"
-#: sys-utils/ipcs.c:405
+#: sys-utils/ipcs.c:404
#, c-format
msgid "max semaphores system wide = %d\n"
msgstr "máximo geral de semáforos do sistema: %d\n"
-#: sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:405
#, c-format
msgid "max ops per semop call = %d\n"
msgstr "máximo de ops por chamada semop: %d\n"
-#: sys-utils/ipcs.c:407
+#: sys-utils/ipcs.c:406
#, c-format
msgid "semaphore max value = %d\n"
msgstr "valor máximo de semáforo: %d\n"
-#: sys-utils/ipcs.c:411
+#: sys-utils/ipcs.c:410
msgid "------ Semaphore Status --------\n"
msgstr "----- Status de semáforo -------\n"
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:411
#, c-format
msgid "used arrays = %d\n"
msgstr "arrays usados: %d\n"
-#: sys-utils/ipcs.c:413
+#: sys-utils/ipcs.c:412
#, c-format
msgid "allocated semaphores = %d\n"
msgstr "semáforos alocados: %d\n"
-#: sys-utils/ipcs.c:417
+#: sys-utils/ipcs.c:416
msgid "------ Semaphore Arrays Creators/Owners --------\n"
msgstr "----- Criadores/donos de arrays de semáforos -----\n"
-#: sys-utils/ipcs.c:419 sys-utils/ipcs.c:434
+#: sys-utils/ipcs.c:418 sys-utils/ipcs.c:433
msgid "semid"
msgstr "semid"
-#: sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:422
msgid "------ Shared Memory Operation/Change Times --------\n"
msgstr "Horários de operação/alteração de memória compartilhada\n"
-#: sys-utils/ipcs.c:424
+#: sys-utils/ipcs.c:423
#, fuzzy, c-format
msgid "%-8s %-10s %-26.24s %-26.24s\n"
msgstr "%-8s%-10s %-26.24s %-26.24s\n"
-#: sys-utils/ipcs.c:425
+#: sys-utils/ipcs.c:424
msgid "last-op"
msgstr "última-op"
-#: sys-utils/ipcs.c:425
+#: sys-utils/ipcs.c:424
msgid "last-changed"
msgstr "útima-alteração"
-#: sys-utils/ipcs.c:432
+#: sys-utils/ipcs.c:431
msgid "------ Semaphore Arrays --------\n"
msgstr "------ Arrays de semáforos ------\n"
-#: sys-utils/ipcs.c:433
+#: sys-utils/ipcs.c:432 sys-utils/ipcs.c:675
#, fuzzy, c-format
-msgid "%-10s %-10s %-10s %-10s %-10s %-12s\n"
-msgstr "%-10s%-10s%-10s%-10s%-10s%-12s\n"
+msgid "%-10s %-10s %-10s %-10s %-10s\n"
+msgstr "%-10s%-10s%-10s%-10s%-10s\n"
-#: sys-utils/ipcs.c:435
+#: sys-utils/ipcs.c:434
msgid "nsems"
msgstr "nsems"
-#: sys-utils/ipcs.c:495
+#: sys-utils/ipcs.c:493
#, fuzzy
msgid "kernel not configured for message queues\n"
msgstr "o kernel não está configurado para semáforos\n"
-#: sys-utils/ipcs.c:503
+#: sys-utils/ipcs.c:501
msgid "------ Messages: Limits --------\n"
msgstr "----- Mensagens: limites -------\n"
-#: sys-utils/ipcs.c:504
+#: sys-utils/ipcs.c:502
#, c-format
msgid "max queues system wide = %d\n"
msgstr "número máximo geral de filas no sistema: %d\n"
-#: sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:503
#, c-format
msgid "max size of message (bytes) = %d\n"
msgstr "tamanho máximo da mensagem (bytes): %d\n"
-#: sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:504
#, c-format
msgid "default max size of queue (bytes) = %d\n"
msgstr "tamanho máximo padrão da fila (bytes): %d\n"
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:508
msgid "------ Messages: Status --------\n"
msgstr "----- Mensagens: status -------\n"
-#: sys-utils/ipcs.c:511
+#: sys-utils/ipcs.c:509
#, c-format
msgid "allocated queues = %d\n"
msgstr "filas alocadas: %d\n"
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:510
#, c-format
msgid "used headers = %d\n"
msgstr "cabeçalhos usados: %d\n"
-#: sys-utils/ipcs.c:513
+#: sys-utils/ipcs.c:511
#, c-format
msgid "used space = %d bytes\n"
msgstr "espaço usado: %d bytes\n"
-#: sys-utils/ipcs.c:517
+#: sys-utils/ipcs.c:515
msgid "------ Message Queues: Creators/Owners --------\n"
msgstr "---- Filas de mensagens: criadores/donos ----\n"
-#: sys-utils/ipcs.c:519 sys-utils/ipcs.c:525 sys-utils/ipcs.c:531
-#: sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:517 sys-utils/ipcs.c:523 sys-utils/ipcs.c:529
+#: sys-utils/ipcs.c:535
msgid "msqid"
msgstr "msqid"
-#: sys-utils/ipcs.c:523
+#: sys-utils/ipcs.c:521
msgid "------ Message Queues Send/Recv/Change Times --------\n"
msgstr "Horários de envio/recepção/alteração de filas de mensagens\n"
-#: sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:522
#, fuzzy, c-format
msgid "%-8s %-10s %-20s %-20s %-20s\n"
msgstr "%-8s%-10s %-20s%-20s%-20s\n"
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:523
msgid "send"
msgstr "envio"
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:523
msgid "recv"
msgstr "recebimento"
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:523
msgid "change"
msgstr "alteração"
-#: sys-utils/ipcs.c:529
+#: sys-utils/ipcs.c:527
msgid "------ Message Queues PIDs --------\n"
msgstr "--- PIDs de filas de mensagens ---\n"
-#: sys-utils/ipcs.c:531
+#: sys-utils/ipcs.c:529
msgid "lspid"
msgstr "lspid"
-#: sys-utils/ipcs.c:531
+#: sys-utils/ipcs.c:529
msgid "lrpid"
msgstr "lrpid"
-#: sys-utils/ipcs.c:535
+#: sys-utils/ipcs.c:533
msgid "------ Message Queues --------\n"
msgstr "----- Filas de mensagens ------\n"
-#: sys-utils/ipcs.c:536
+#: sys-utils/ipcs.c:534
#, fuzzy, c-format
msgid "%-10s %-10s %-10s %-10s %-12s %-12s\n"
msgstr "%-10s%-10s%-10s%-10s%-12s%-12s\n"
-#: sys-utils/ipcs.c:538
+#: sys-utils/ipcs.c:536
msgid "used-bytes"
msgstr "bytes usados"
-#: sys-utils/ipcs.c:538
+#: sys-utils/ipcs.c:536
msgid "messages"
msgstr "mensagens"
-#: sys-utils/ipcs.c:606
+#: sys-utils/ipcs.c:604
#, c-format
msgid ""
"\n"
@@ -8858,37 +9081,37 @@ msgstr ""
"\n"
"Memória compartilhada: shmid de segmento = %d\n"
-#: sys-utils/ipcs.c:607
+#: sys-utils/ipcs.c:605
#, c-format
msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
-#: sys-utils/ipcs.c:609
+#: sys-utils/ipcs.c:607
#, c-format
msgid "mode=%#o\taccess_perms=%#o\n"
msgstr "mode=%#o\taccess_perms=%#o\n"
-#: sys-utils/ipcs.c:611
+#: sys-utils/ipcs.c:609
#, c-format
msgid "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n"
msgstr "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n"
-#: sys-utils/ipcs.c:614
+#: sys-utils/ipcs.c:612
#, fuzzy, c-format
msgid "att_time=%-26.24s\n"
msgstr "att_time=%s"
-#: sys-utils/ipcs.c:616
+#: sys-utils/ipcs.c:614
#, fuzzy, c-format
msgid "det_time=%-26.24s\n"
msgstr "det_time=%s"
-#: sys-utils/ipcs.c:618 sys-utils/ipcs.c:649
+#: sys-utils/ipcs.c:616 sys-utils/ipcs.c:647
#, fuzzy, c-format
msgid "change_time=%-26.24s\n"
msgstr "change_time=%s"
-#: sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:631
#, c-format
msgid ""
"\n"
@@ -8897,27 +9120,27 @@ msgstr ""
"\n"
"msqid da fila de mensagens: %d\n"
-#: sys-utils/ipcs.c:634
+#: sys-utils/ipcs.c:632
#, c-format
msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
-#: sys-utils/ipcs.c:636
+#: sys-utils/ipcs.c:634
#, c-format
msgid "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
msgstr "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
-#: sys-utils/ipcs.c:645
+#: sys-utils/ipcs.c:643
#, fuzzy, c-format
msgid "send_time=%-26.24s\n"
msgstr "send_time=%s"
-#: sys-utils/ipcs.c:647
+#: sys-utils/ipcs.c:645
#, fuzzy, c-format
msgid "rcv_time=%-26.24s\n"
msgstr "rcv_time=%s"
-#: sys-utils/ipcs.c:667
+#: sys-utils/ipcs.c:665
#, c-format
msgid ""
"\n"
@@ -8926,53 +9149,48 @@ msgstr ""
"\n"
"semid de array de semáforos: %d\n"
-#: sys-utils/ipcs.c:668
+#: sys-utils/ipcs.c:666
#, c-format
msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
msgstr "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
-#: sys-utils/ipcs.c:670
+#: sys-utils/ipcs.c:668
#, c-format
msgid "mode=%#o, access_perms=%#o\n"
msgstr "mode=%#o, access_perms=%#o\n"
-#: sys-utils/ipcs.c:672
+#: sys-utils/ipcs.c:670
#, c-format
msgid "nsems = %ld\n"
msgstr "nsems = %ld\n"
-#: sys-utils/ipcs.c:673
+#: sys-utils/ipcs.c:671
#, fuzzy, c-format
msgid "otime = %-26.24s\n"
msgstr "otime = %s"
-#: sys-utils/ipcs.c:675
+#: sys-utils/ipcs.c:673
#, fuzzy, c-format
msgid "ctime = %-26.24s\n"
msgstr "ctime = %s"
-#: sys-utils/ipcs.c:677
-#, fuzzy, c-format
-msgid "%-10s %-10s %-10s %-10s %-10s\n"
-msgstr "%-10s%-10s%-10s%-10s%-10s\n"
-
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "semnum"
msgstr "semnum"
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "value"
msgstr "valor"
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "ncount"
msgstr "ncount"
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "zcount"
msgstr "zcount"
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "pid"
msgstr "pid"
@@ -9228,11 +9446,11 @@ msgstr "-- linha já descarregada"
msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
msgstr "Uso: %s [ - ] [ -2 ] [ arquivo ... ]\n"
-#: text-utils/column.c:298
+#: text-utils/column.c:297
msgid "line too long"
msgstr "linha longa demais"
-#: text-utils/column.c:375
+#: text-utils/column.c:374
msgid "usage: column [-tx] [-c columns] [file ...]\n"
msgstr "Uso: column [-tx] [-c colunas] [arquivo ...]\n"
@@ -9326,33 +9544,33 @@ msgstr ""
msgid "Can't open help file"
msgstr "Não foi possível abrir o arquivo de ajuda"
-#: text-utils/more.c:1442 text-utils/more.c:1446
+#: text-utils/more.c:1442 text-utils/more.c:1447
msgid "[Press 'h' for instructions.]"
msgstr "[Pressione 'h' para obter instruções.]"
-#: text-utils/more.c:1480
+#: text-utils/more.c:1481
#, c-format
msgid "\"%s\" line %d"
msgstr "\"%s\" linha %d"
-#: text-utils/more.c:1482
+#: text-utils/more.c:1483
#, c-format
msgid "[Not a file] line %d"
msgstr "[Não é um arquivo] linha %d"
-#: text-utils/more.c:1566
+#: text-utils/more.c:1567
msgid " Overflow\n"
msgstr " Estouro\n"
-#: text-utils/more.c:1613
+#: text-utils/more.c:1614
msgid "...skipping\n"
msgstr "...pulando\n"
-#: text-utils/more.c:1643
+#: text-utils/more.c:1644
msgid "Regular expression botch"
msgstr "Expressão regular malformada"
-#: text-utils/more.c:1655
+#: text-utils/more.c:1656
msgid ""
"\n"
"Pattern not found\n"
@@ -9360,15 +9578,15 @@ msgstr ""
"\n"
"Padrão não encontrado\n"
-#: text-utils/more.c:1658
+#: text-utils/more.c:1659 text-utils/pg.c:1134 text-utils/pg.c:1285
msgid "Pattern not found"
msgstr "Padrão não encontrado"
-#: text-utils/more.c:1719
+#: text-utils/more.c:1720
msgid "can't fork\n"
msgstr "não foi possível realizar fork\n"
-#: text-utils/more.c:1758
+#: text-utils/more.c:1759
msgid ""
"\n"
"...Skipping "
@@ -9376,21 +9594,21 @@ msgstr ""
"\n"
"...Pulando "
-#: text-utils/more.c:1763
+#: text-utils/more.c:1764
#, fuzzy
msgid "...Skipping to file "
msgstr "...Pulando "
-#: text-utils/more.c:1765
+#: text-utils/more.c:1766
#, fuzzy
msgid "...Skipping back to file "
msgstr "de volta ao arquivo"
-#: text-utils/more.c:2046
+#: text-utils/more.c:2047
msgid "Line too long"
msgstr "Linha longa demais"
-#: text-utils/more.c:2089
+#: text-utils/more.c:2090
msgid "No previous command to substitute for"
msgstr "Não há comando anterior para ser substituído"
@@ -9440,6 +9658,102 @@ msgstr "hexdump: formato inválido{%s}\n"
msgid "hexdump: bad conversion character %%%s.\n"
msgstr "hexdump: caractere de conversão inválido %%%s.\n"
+#: text-utils/pg.c:246
+#, c-format
+msgid ""
+"%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
+msgstr ""
+
+#: text-utils/pg.c:255
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- %s\n"
+msgstr "a opção `%s' exige um argumento\n"
+
+#: text-utils/pg.c:263
+#, fuzzy, c-format
+msgid "%s: illegal option -- %s\n"
+msgstr "Tecla ilegal"
+
+#: text-utils/pg.c:380
+#, fuzzy
+msgid "...skipping forward\n"
+msgstr "...pulando\n"
+
+#: text-utils/pg.c:382
+#, fuzzy
+msgid "...skipping backward\n"
+msgstr "...pulando\n"
+
+#: text-utils/pg.c:404
+#, fuzzy
+msgid "No next file"
+msgstr "(Próximo arquivo: %s)"
+
+#: text-utils/pg.c:408
+#, fuzzy
+msgid "No previous file"
+msgstr "Nenhuma partição definida\n"
+
+#: text-utils/pg.c:938
+#, fuzzy, c-format
+msgid "%s: Read error from %s file\n"
+msgstr "%s: erro de leitura em %s\n"
+
+#.
+#. * Most likely '\0' in input.
+#.
+#: text-utils/pg.c:944
+#, c-format
+msgid "%s: Unexpected EOF in %s file\n"
+msgstr ""
+
+#: text-utils/pg.c:947
+#, fuzzy, c-format
+msgid "%s: Unknown error in %s file\n"
+msgstr "%s: erro de procura em %s\n"
+
+#: text-utils/pg.c:1042
+#, fuzzy, c-format
+msgid "%s: Cannot create tempfile\n"
+msgstr "%s: não foi possível ler arquivo temporário.\n"
+
+#: text-utils/pg.c:1051 text-utils/pg.c:1226
+#, fuzzy
+msgid "RE error: "
+msgstr ", erro"
+
+#: text-utils/pg.c:1208
+msgid "(EOF)"
+msgstr ""
+
+#: text-utils/pg.c:1234
+msgid "No remembered search string"
+msgstr ""
+
+#: text-utils/pg.c:1317
+#, fuzzy
+msgid "Cannot open "
+msgstr "Não foi possível abrir %s\n"
+
+#: text-utils/pg.c:1365
+#, fuzzy
+msgid "saved"
+msgstr "envio"
+
+#: text-utils/pg.c:1472
+msgid ": !command not allowed in rflag mode.\n"
+msgstr ""
+
+#: text-utils/pg.c:1504
+#, fuzzy
+msgid "fork() failed, try again later\n"
+msgstr "A senha *NÃO* foi alterada. Tente novamente mais tarde.\n"
+
+#: text-utils/pg.c:1709
+#, fuzzy
+msgid "(Next file: "
+msgstr "(Próximo arquivo: %s)"
+
#: text-utils/rev.c:113
msgid "Unable to allocate bufferspace\n"
msgstr "Não foi possível alocar espaço em buffer\n"
@@ -9474,6 +9788,28 @@ msgstr "Linha de entrada longa demais.\n"
msgid "Out of memory when growing buffer.\n"
msgstr "Falta memória quando o buffer cresce.\n"
+#~ msgid "invalid number `%s'\n"
+#~ msgstr "número `%s' inválido\n"
+
+#~ msgid "number `%s' to `%s' out of range\n"
+#~ msgstr "número `%s' a `%s' fora do intervalo\n"
+
+#~ msgid "unrecognized option `%s'\n"
+#~ msgstr "opção `%s' não reconhecida\n"
+
+#~ msgid "option `%s' requires an argument\n"
+#~ msgstr "a opção `%s' exige um argumento\n"
+
+#~ msgid "option `%s' doesn't allow an argument\n"
+#~ msgstr "a opção `%s' não permite um argumento\n"
+
+#~ msgid "unrecognized option `-%c'\n"
+#~ msgstr "opção `-%c' não reconhecida\n"
+
+#, fuzzy
+#~ msgid "%-10s %-10s %-10s %-10s %-10s %-12s\n"
+#~ msgstr "%-10s%-10s%-10s%-10s%-10s%-12s\n"
+
#~ msgid "umount: only %s can unmount %s from %s"
#~ msgstr "umount: somente %s pode desmontar %s de %s"
diff --git a/po/sv.po b/po/sv.po
index 9a18d1d40..b60c00892 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,9 +9,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: util-linux 2.11q\n"
-"POT-Creation-Date: 2002-05-09 02:51+0200\n"
-"PO-Revision-Date: 2002-05-05 20:15+0200\n"
+"Project-Id-Version: util-linux 2.11r\n"
+"POT-Creation-Date: 2002-07-07 17:03+0200\n"
+"PO-Revision-Date: 2002-05-15 19:38+0200\n"
"Last-Translator: Christian Rose <menthos@menthos.com>\n"
"Language-Team: Swedish <sv@li.org>\n"
"MIME-Version: 1.0\n"
@@ -113,28 +113,28 @@ msgstr "RO RA SSZ BSZ Startsektor Storlek Enhet\n"
msgid "usage:\n"
msgstr "användning:\n"
-#: disk-utils/fdformat.c:35
+#: disk-utils/fdformat.c:31
msgid "Formatting ... "
msgstr "Formaterar... "
-#: disk-utils/fdformat.c:53 disk-utils/fdformat.c:88
+#: disk-utils/fdformat.c:49 disk-utils/fdformat.c:84
msgid "done\n"
msgstr "klar\n"
-#: disk-utils/fdformat.c:64
+#: disk-utils/fdformat.c:60
msgid "Verifying ... "
msgstr "Verifierar... "
-#: disk-utils/fdformat.c:75
+#: disk-utils/fdformat.c:71
msgid "Read: "
msgstr "Läste: "
-#: disk-utils/fdformat.c:77
+#: disk-utils/fdformat.c:73
#, c-format
msgid "Problem reading cylinder %d, expected %d, read %d\n"
msgstr "Problem vid läsning av cylinder %d, förväntade %d, läste %d\n"
-#: disk-utils/fdformat.c:83
+#: disk-utils/fdformat.c:79
#, c-format
msgid ""
"bad data in cyl %d\n"
@@ -143,42 +143,148 @@ msgstr ""
"felaktig data på cylinder %d\n"
"Fortsätter... "
-#: disk-utils/fdformat.c:98
+#: disk-utils/fdformat.c:94
#, c-format
msgid "usage: %s [ -n ] device\n"
msgstr "användning: %s [ -n ] enhet\n"
-#: disk-utils/fdformat.c:120 disk-utils/fsck.minix.c:1291
+#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1291
#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:55
-#: disk-utils/mkfs.minix.c:644 disk-utils/mkswap.c:457
-#: disk-utils/setfdprm.c:128 misc-utils/cal.c:246 misc-utils/ddate.c:181
-#: misc-utils/kill.c:188 misc-utils/rename.c:79 misc-utils/script.c:132
+#: disk-utils/mkfs.cramfs.c:665 disk-utils/mkfs.minix.c:644
+#: disk-utils/mkswap.c:457 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1170
+#: misc-utils/cal.c:246 misc-utils/ddate.c:181 misc-utils/kill.c:188
+#: misc-utils/rename.c:79 misc-utils/script.c:132
#, c-format
msgid "%s from %s\n"
msgstr "%s från %s\n"
-#: disk-utils/fdformat.c:134
-#, c-format
-msgid "%s: not a floppy device\n"
+#: disk-utils/fdformat.c:130
+#, fuzzy, c-format
+msgid "%s: not a block device\n"
msgstr "%s: inte en diskettenhet\n"
-#: disk-utils/fdformat.c:143
+#: disk-utils/fdformat.c:140
msgid "Could not determine current format type"
msgstr "Kunde inte avgöra nuvarande formattyp"
-#: disk-utils/fdformat.c:144
+#: disk-utils/fdformat.c:141
#, c-format
msgid "%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n"
msgstr "%ssidig, %d spår, %d sektorer/spår. Total kapacitet %d kB.\n"
-#: disk-utils/fdformat.c:145
+#: disk-utils/fdformat.c:142
msgid "Double"
msgstr "Dubbel"
-#: disk-utils/fdformat.c:145
+#: disk-utils/fdformat.c:142
msgid "Single"
msgstr "Enkel"
+#: disk-utils/fsck.cramfs.c:98
+#, c-format
+msgid ""
+"usage: %s [-hv] [-x dir] file\n"
+" -h print this help\n"
+" -x dir extract into dir\n"
+" -v be more verbose\n"
+" file file to test\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:191
+#, c-format
+msgid "%s: error %d while decompressing! %p(%d)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:243
+#, fuzzy, c-format
+msgid "%s: size error in symlink `%s'\n"
+msgstr "%s: sökfel på %s\n"
+
+#: disk-utils/fsck.cramfs.c:258 disk-utils/fsck.cramfs.c:328
+#, c-format
+msgid " uncompressing block at %ld to %ld (%ld)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:287
+#, c-format
+msgid "%s: bogus mode on `%s' (%o)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:319
+#, fuzzy, c-format
+msgid " hole at %ld (%d)\n"
+msgstr "borde vara (%d, %d, %d)\n"
+
+#: disk-utils/fsck.cramfs.c:337
+#, c-format
+msgid "%s: Non-block (%ld) bytes\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:343
+#, c-format
+msgid "%s: Non-size (%ld vs %ld) bytes\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:392
+#, c-format
+msgid "%s: invalid cramfs--bad path length\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:472
+#, fuzzy, c-format
+msgid "%s: compiled without -x support\n"
+msgstr "%s: inte kompilerad med stöd för minix v2\n"
+
+#: disk-utils/fsck.cramfs.c:498
+#, c-format
+msgid "%s: warning--unable to determine filesystem size \n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:508
+#, fuzzy, c-format
+msgid "%s is not a block device or file\n"
+msgstr "%s: inte en diskettenhet\n"
+
+#: disk-utils/fsck.cramfs.c:514 disk-utils/fsck.cramfs.c:549
+#, c-format
+msgid "%s: invalid cramfs--file length too short\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:541
+#, c-format
+msgid "%s: invalid cramfs--wrong magic\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:554
+#, c-format
+msgid "%s: warning--file length too long, padded image?\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:564
+#, fuzzy, c-format
+msgid "%s: invalid cramfs--crc error\n"
+msgstr "%s: fel vid flaggtolkning\n"
+
+#: disk-utils/fsck.cramfs.c:570
+#, c-format
+msgid "%s: warning--old cramfs image, no CRC\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:592
+#, c-format
+msgid "%s: invalid cramfs--bad superblock\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:608
+#, c-format
+msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:616
+#, c-format
+msgid "%s: invalid cramfs--invalid file data offset\n"
+msgstr ""
+
#: disk-utils/fsck.minix.c:200
#, c-format
msgid "Usage: %s [-larvsmf] /dev/name\n"
@@ -646,7 +752,7 @@ msgstr "för många inoder - max är 512"
msgid "not enough space, need at least %lu blocks"
msgstr "inte tillräckligt med utrymme, behöver minst %lu block"
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2057
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2069
#, c-format
msgid "Device: %s\n"
msgstr "Enhet: %s\n"
@@ -732,6 +838,130 @@ msgstr "%s: Slut på minne!\n"
msgid "mkfs version %s (%s)\n"
msgstr "mkfs version %s (%s)\n"
+#: disk-utils/mkfs.cramfs.c:49
+#, c-format
+msgid ""
+"usage: %s [-h] [-v] [-e edition] [-i file] [-n name] dirname outfile\n"
+" -h print this help\n"
+" -v be verbose\n"
+" -E make all warnings errors (non-zero exit status)\n"
+" -e edition set edition number (part of fsid)\n"
+" -i file insert a file image into the filesystem (requires >= 2.4.0)\n"
+" -n name set name of cramfs filesystem\n"
+" -p pad by %d bytes for boot code\n"
+" -s sort directory entries (old option, ignored)\n"
+" -z make explicit holes (requires >= 2.3.39)\n"
+" dirname root of the filesystem to be compressed\n"
+" outfile output file\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:213
+#, c-format
+msgid ""
+"Very long (%u bytes) filename `%s' found.\n"
+" Please increase MAX_INPUT_NAMELEN in mkcramfs.c and recompile. Exiting.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:371
+msgid "filesystem too big. Exiting.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:422
+msgid ""
+"Exceeded MAXENTRIES. Raise this value in mkcramfs.c and recompile. "
+"Exiting.\n"
+msgstr ""
+
+#. (I don't think this can happen with zlib.)
+#: disk-utils/mkfs.cramfs.c:520
+#, c-format
+msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:537
+#, c-format
+msgid "%6.2f%% (%+d bytes)\t%s\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:705
+#, c-format
+msgid ""
+"warning: guestimate of required size (upper bound) is %LdMB, but maximum "
+"image size is %uMB. We might die prematurely.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:747
+#, fuzzy, c-format
+msgid "Including: %s\n"
+msgstr "ogiltigt id: %s\n"
+
+#: disk-utils/mkfs.cramfs.c:753
+#, c-format
+msgid "Directory data: %d bytes\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:761
+#, c-format
+msgid "Everything: %d kilobytes\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:766
+#, fuzzy, c-format
+msgid "Super block: %d bytes\n"
+msgstr "använt utrymme = %d byte\n"
+
+#: disk-utils/mkfs.cramfs.c:773
+#, c-format
+msgid "CRC: %x\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:778
+#, c-format
+msgid "not enough space allocated for ROM image (%Ld allocated, %d used)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:790
+#, c-format
+msgid "ROM image write failed (%d %d)\n"
+msgstr ""
+
+#. (These warnings used to come at the start, but they scroll off the
+#. screen too quickly.)
+#. (can't happen when reading from ext2fs)
+#. bytes, not chars: think UTF8.
+#: disk-utils/mkfs.cramfs.c:799
+#, fuzzy
+msgid "warning: filenames truncated to 255 bytes.\n"
+msgstr "Varning: antalet inoder är för stort.\n"
+
+#: disk-utils/mkfs.cramfs.c:802
+msgid "warning: files were skipped due to errors.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:805
+#, c-format
+msgid "warning: file sizes truncated to %luMB (minus 1 byte).\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:810
+#, c-format
+msgid ""
+"warning: uids truncated to %u bits. (This may be a security concern.)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:815
+#, c-format
+msgid ""
+"warning: gids truncated to %u bits. (This may be a security concern.)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:820
+#, c-format
+msgid ""
+"WARNING: device numbers truncated to %u bits. This almost certainly means\n"
+"that some device files will be wrong.\n"
+msgstr ""
+
#: disk-utils/mkfs.minix.c:181
#, c-format
msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
@@ -877,7 +1107,7 @@ msgid "too many bad pages"
msgstr "för många felaktiga sidor"
#: disk-utils/mkswap.c:359 misc-utils/look.c:182 misc-utils/setterm.c:1130
-#: text-utils/more.c:2062 text-utils/more.c:2073
+#: text-utils/more.c:2063 text-utils/more.c:2074
msgid "Out of memory"
msgstr "Slut på minne"
@@ -944,9 +1174,9 @@ msgid "Unable to set up swap-space: unreadable"
msgstr "Kan inte ställa in växlingsutrymme: oläsbart"
#: disk-utils/mkswap.c:611
-#, fuzzy, c-format
+#, c-format
msgid "Setting up swapspace version %d, size = %lu KiB\n"
-msgstr "Ställer in växlingsutrymme version %d, storlek = %lu byte\n"
+msgstr "Ställer in växlingsutrymme version %d, storlek = %lu KiB\n"
#: disk-utils/mkswap.c:617
msgid "unable to rewind swap-device"
@@ -1324,7 +1554,7 @@ msgstr " Logisk "
#. odd flag on end
#. type id
#. type name
-#: fdisk/cfdisk.c:1996 fdisk/fdisk.c:1306 fdisk/fdisk.c:1594
+#: fdisk/cfdisk.c:1996 fdisk/fdisk.c:1318 fdisk/fdisk.c:1606
#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:690 fdisk/sfdisk.c:581
msgid "Unknown"
msgstr "Okänd"
@@ -1875,7 +2105,7 @@ msgstr ""
"-c C -h H -s S: Åsidosätt kärnans uppfattning om antalet cylindrar,\n"
" antalet huvuden och antalet sektorer per spår.\n"
-#: fdisk/fdisk.c:194
+#: fdisk/fdisk.c:195
msgid ""
"Usage: fdisk [-b SSZ] [-u] DISK Change partition table\n"
" fdisk -l [-b SSZ] [-u] DISK List partition table(s)\n"
@@ -1895,7 +2125,7 @@ msgstr ""
"-u: visa början och slut i sektorer (istället för cylindrar)\n"
"-b 2048: (för vissa MO-enheter) använd 2048-bytessektorer\n"
-#: fdisk/fdisk.c:206
+#: fdisk/fdisk.c:207
msgid ""
"Usage: fdisk [-l] [-b SSZ] [-u] device\n"
"E.g.: fdisk /dev/hda (for the first IDE disk)\n"
@@ -1912,222 +2142,222 @@ msgstr ""
"enheter)\n"
" ...\n"
-#: fdisk/fdisk.c:215
+#: fdisk/fdisk.c:216
#, c-format
msgid "Unable to open %s\n"
msgstr "Kan inte öppna %s\n"
-#: fdisk/fdisk.c:219
+#: fdisk/fdisk.c:220
#, c-format
msgid "Unable to read %s\n"
msgstr "Kan inte läsa %s\n"
-#: fdisk/fdisk.c:223
+#: fdisk/fdisk.c:224
#, c-format
msgid "Unable to seek on %s\n"
msgstr "Kan inte söka på %s\n"
-#: fdisk/fdisk.c:227
+#: fdisk/fdisk.c:228
#, c-format
msgid "Unable to write %s\n"
msgstr "Kan inte skriva %s\n"
-#: fdisk/fdisk.c:231
+#: fdisk/fdisk.c:232
#, c-format
msgid "BLKGETSIZE ioctl failed on %s\n"
msgstr "BLKGETSIZE-ioctl:en misslyckades på %s\n"
-#: fdisk/fdisk.c:235
+#: fdisk/fdisk.c:236
msgid "Unable to allocate any more memory\n"
msgstr "Kan inte allokera mer minne\n"
-#: fdisk/fdisk.c:238
+#: fdisk/fdisk.c:239
msgid "Fatal error\n"
msgstr "Ödesdigert fel\n"
-#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:359 fdisk/fdisk.c:366
-#: fdisk/fdisk.c:389 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:439
-#: fdisk/fdiskbsdlabel.c:124
+#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:360 fdisk/fdisk.c:367
+#: fdisk/fdisk.c:390 fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:440
+#: fdisk/fdiskbsdlabel.c:129
msgid "Command action"
msgstr "Kommandoåtgärd"
-#: fdisk/fdisk.c:323
+#: fdisk/fdisk.c:324
msgid " a toggle a read only flag"
msgstr " a slå på/av en flagga för skrivskydd"
#. sun
-#: fdisk/fdisk.c:324 fdisk/fdisk.c:368
+#: fdisk/fdisk.c:325 fdisk/fdisk.c:369
msgid " b edit bsd disklabel"
msgstr " b redigera bsd-disketikett"
-#: fdisk/fdisk.c:325
+#: fdisk/fdisk.c:326
msgid " c toggle the mountable flag"
msgstr " c slå på/av monterbarhetsflaggan"
#. sun
-#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:370
+#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:371
msgid " d delete a partition"
msgstr " d ta bort en partition"
-#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:371
+#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:372
msgid " l list known partition types"
msgstr " l lista kända partitionstyper"
#. sun
-#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:360 fdisk/fdisk.c:372
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
-#: fdisk/fdiskbsdlabel.c:129
+#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:361 fdisk/fdisk.c:373
+#: fdisk/fdisk.c:398 fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
+#: fdisk/fdiskbsdlabel.c:134
msgid " m print this menu"
msgstr " m visa denna meny"
-#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
+#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374
msgid " n add a new partition"
msgstr " n lägg till en ny partition"
-#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:361 fdisk/fdisk.c:374
+#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:362 fdisk/fdisk.c:375
msgid " o create a new empty DOS partition table"
msgstr " o skapa en ny tom DOS-partitionstabell"
-#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:375 fdisk/fdisk.c:398
-#: fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:376 fdisk/fdisk.c:399
+#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
msgid " p print the partition table"
msgstr " p visa partitionstabellen"
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:362 fdisk/fdisk.c:376
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
-#: fdisk/fdiskbsdlabel.c:132
+#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:363 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:450
+#: fdisk/fdiskbsdlabel.c:137
msgid " q quit without saving changes"
msgstr " q avsluta utan att spara ändringar"
-#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:363 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:364 fdisk/fdisk.c:378
msgid " s create a new empty Sun disklabel"
msgstr " s skapa en ny tom Sun-disketikett"
#. sun
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
msgid " t change a partition's system id"
msgstr " t ändra en partitions system-id"
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
msgid " u change display/entry units"
msgstr " u ändra visnings-/postenheter"
-#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380 fdisk/fdisk.c:402
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:452
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381 fdisk/fdisk.c:403
+#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
msgid " v verify the partition table"
msgstr " v verifiera partitionstabellen"
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381 fdisk/fdisk.c:403
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:382 fdisk/fdisk.c:404
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
msgid " w write table to disk and exit"
msgstr " w skriv tabellen till disk och avsluta"
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:383
msgid " x extra functionality (experts only)"
msgstr " x extra funktionalitet (endast experter)"
-#: fdisk/fdisk.c:342
+#: fdisk/fdisk.c:343
msgid " a select bootable partition"
msgstr " a välj startbar partition"
#. sgi flavour
-#: fdisk/fdisk.c:343
+#: fdisk/fdisk.c:344
msgid " b edit bootfile entry"
msgstr " b redigera startfilspost"
#. sgi
-#: fdisk/fdisk.c:344
+#: fdisk/fdisk.c:345
msgid " c select sgi swap partition"
msgstr " c välj sgi-växlingspartition"
-#: fdisk/fdisk.c:367
+#: fdisk/fdisk.c:368
msgid " a toggle a bootable flag"
msgstr " a slå på/av en startbarhetsflagga"
-#: fdisk/fdisk.c:369
+#: fdisk/fdisk.c:370
msgid " c toggle the dos compatibility flag"
msgstr " c slå på/av dos-kompatibilitetsflaggan"
-#: fdisk/fdisk.c:390
+#: fdisk/fdisk.c:391
msgid " a change number of alternate cylinders"
msgstr " a ändra antalet alternativa cylindrar"
#. sun
-#: fdisk/fdisk.c:391 fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:441
+#: fdisk/fdisk.c:392 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
msgid " c change number of cylinders"
msgstr " c ändra antalet cylindrar"
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:393 fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:443
msgid " d print the raw data in the partition table"
msgstr " d skriv ut den råa datan i partitionstabellen"
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:394
msgid " e change number of extra sectors per cylinder"
msgstr " e ändra antalet extra sektorer per cylinder"
#. sun
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:395 fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
msgid " h change number of heads"
msgstr " h ändra antalet huvuden"
-#: fdisk/fdisk.c:395
+#: fdisk/fdisk.c:396
msgid " i change interleave factor"
msgstr " i ändra mellanrumsfaktor"
#. sun
-#: fdisk/fdisk.c:396
+#: fdisk/fdisk.c:397
msgid " o change rotation speed (rpm)"
msgstr " o ändra rotationshastighet (varv per minut)"
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:450
-#: fdisk/fdiskbsdlabel.c:133
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:451
+#: fdisk/fdiskbsdlabel.c:138
msgid " r return to main menu"
msgstr " r återgå till huvudmenyn"
-#: fdisk/fdisk.c:401 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:452
msgid " s change number of sectors/track"
msgstr " s ändra antalet sektorer/spår"
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:405
msgid " y change number of physical cylinders"
msgstr " y ändra antalet fysiska cylindrar"
-#: fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:440
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:441
msgid " b move beginning of data in a partition"
msgstr " b flytta början på data i en partition"
-#: fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:443
+#: fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:444
msgid " e list extended partitions"
msgstr " e lista utökade partitioner"
#. !sun
-#: fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
msgid " g create an IRIX (SGI) partition table"
msgstr " g skapa en IRIX-partitionstabell (SGI)"
#. !sun
-#: fdisk/fdisk.c:444
+#: fdisk/fdisk.c:445
msgid " f fix partition order"
msgstr " f fixa partitionsordningen"
-#: fdisk/fdisk.c:561
+#: fdisk/fdisk.c:562
msgid "You must set"
msgstr "Du måste ställa in"
-#: fdisk/fdisk.c:575
+#: fdisk/fdisk.c:576
msgid "heads"
msgstr "huvuden"
-#: fdisk/fdisk.c:577 fdisk/fdisk.c:1142 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:578 fdisk/fdisk.c:1154 fdisk/sfdisk.c:864
msgid "sectors"
msgstr "sektorer"
-#: fdisk/fdisk.c:579 fdisk/fdisk.c:1142 fdisk/fdiskbsdlabel.c:464
+#: fdisk/fdisk.c:580 fdisk/fdisk.c:1154 fdisk/fdiskbsdlabel.c:469
#: fdisk/sfdisk.c:864
msgid "cylinders"
msgstr "cylindrar"
-#: fdisk/fdisk.c:583
+#: fdisk/fdisk.c:584
#, c-format
msgid ""
"%s%s.\n"
@@ -2136,11 +2366,11 @@ msgstr ""
"%s%s.\n"
"Du kan göra detta från menyn extra funktionalitet.\n"
-#: fdisk/fdisk.c:584
+#: fdisk/fdisk.c:585
msgid " and "
msgstr " och "
-#: fdisk/fdisk.c:601
+#: fdisk/fdisk.c:602
#, c-format
msgid ""
"\n"
@@ -2160,26 +2390,26 @@ msgstr ""
"2) start- och partitioneringsprogramvara från andra operativsystem\n"
" (exemeplvis DOS FDISK, OS/2 FDISK)\n"
-#: fdisk/fdisk.c:624
+#: fdisk/fdisk.c:625
msgid "Bad offset in primary extended partition\n"
msgstr "Felaktigt avstånd i primär utökad partition\n"
-#: fdisk/fdisk.c:638
+#: fdisk/fdisk.c:639
#, c-format
msgid "Warning: deleting partitions after %d\n"
msgstr "Varning: tar bort partitioner efter %d\n"
-#: fdisk/fdisk.c:655
+#: fdisk/fdisk.c:656
#, c-format
msgid "Warning: extra link pointer in partition table %d\n"
msgstr "Varning: extra länkpekare i partitionstabell %d\n"
-#: fdisk/fdisk.c:663
+#: fdisk/fdisk.c:664
#, c-format
msgid "Warning: ignoring extra data in partition table %d\n"
msgstr "Varning: ignorerar extra data i partitionstabell %d\n"
-#: fdisk/fdisk.c:708
+#: fdisk/fdisk.c:709
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"
@@ -2191,16 +2421,22 @@ msgstr ""
"inte det tidigare innehållet att kunna återställas.\n"
"\n"
-#: fdisk/fdisk.c:752
+#: fdisk/fdisk.c:753
#, c-format
msgid "Note: sector size is %d (not %d)\n"
msgstr "Observera: sektorstorleken är %d (inte %d)\n"
-#: fdisk/fdisk.c:870
+#: fdisk/fdisk.c:883
msgid "You will not be able to write the partition table.\n"
msgstr "Du kommer inte att kunna skriva partitionstabellen.\n"
-#: fdisk/fdisk.c:903
+#: fdisk/fdisk.c:914
+msgid ""
+"This disk has both DOS and BSD magic.\n"
+"Give the 'b' command to go to BSD mode.\n"
+msgstr ""
+
+#: fdisk/fdisk.c:924
msgid ""
"Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
"disklabel\n"
@@ -2208,16 +2444,16 @@ msgstr ""
"Enheten innehåller varken en giltig DOS-partitionstabell eller en Sun-, SGI- "
"eller OSF-disketikett\n"
-#: fdisk/fdisk.c:920
+#: fdisk/fdisk.c:942
msgid "Internal error\n"
msgstr "Internt fel\n"
-#: fdisk/fdisk.c:942
+#: fdisk/fdisk.c:954
#, c-format
msgid "Ignoring extra extended partition %d\n"
msgstr "Ignorerar extra utökad partition %d\n"
-#: fdisk/fdisk.c:954
+#: fdisk/fdisk.c:966
#, c-format
msgid ""
"Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2226,7 +2462,7 @@ msgstr ""
"Varning: ogiltiga flaggan 0x%04x i partitionstabell %d kommer ett korrigeras "
"vid skrivning med w\n"
-#: fdisk/fdisk.c:976
+#: fdisk/fdisk.c:988
msgid ""
"\n"
"got EOF thrice - exiting..\n"
@@ -2234,65 +2470,65 @@ msgstr ""
"\n"
"mottog EOF tre gånger - avslutar...\n"
-#: fdisk/fdisk.c:1015
+#: fdisk/fdisk.c:1027
msgid "Hex code (type L to list codes): "
msgstr "Hexadecimal kod (tryck L för att se koder): "
-#: fdisk/fdisk.c:1054
+#: fdisk/fdisk.c:1066
#, c-format
msgid "%s (%d-%d, default %d): "
msgstr "%s (%d-%d, standardvärde %d): "
-#: fdisk/fdisk.c:1110
+#: fdisk/fdisk.c:1122
#, c-format
msgid "Using default value %d\n"
msgstr "Använder standardvärdet %d\n"
-#: fdisk/fdisk.c:1114
+#: fdisk/fdisk.c:1126
msgid "Value out of range.\n"
msgstr "Värdet är utanför intervallet.\n"
-#: fdisk/fdisk.c:1124
+#: fdisk/fdisk.c:1136
msgid "Partition number"
msgstr "Partitionsnummer"
-#: fdisk/fdisk.c:1133
+#: fdisk/fdisk.c:1145
#, c-format
msgid "Warning: partition %d has empty type\n"
msgstr "Varning: partition %d har tom typ\n"
-#: fdisk/fdisk.c:1140
+#: fdisk/fdisk.c:1152
msgid "cylinder"
msgstr "cylinder"
-#: fdisk/fdisk.c:1140
+#: fdisk/fdisk.c:1152
msgid "sector"
msgstr "sektor"
-#: fdisk/fdisk.c:1149
+#: fdisk/fdisk.c:1161
#, c-format
msgid "Changing display/entry units to %s\n"
msgstr "Ändrar visnings-/inmatningsenheter till %s\n"
-#: fdisk/fdisk.c:1160
+#: fdisk/fdisk.c:1172
#, c-format
msgid "WARNING: Partition %d is an extended partition\n"
msgstr "VARNING: Partition %d är en utökad partition\n"
-#: fdisk/fdisk.c:1171
+#: fdisk/fdisk.c:1183
msgid "DOS Compatibility flag is set\n"
msgstr "DOS-kompatibilitetsflagga är satt\n"
-#: fdisk/fdisk.c:1175
+#: fdisk/fdisk.c:1187
msgid "DOS Compatibility flag is not set\n"
msgstr "DOS-kompatibilitetsflagga är inte satt\n"
-#: fdisk/fdisk.c:1261
+#: fdisk/fdisk.c:1273
#, c-format
msgid "Partition %d does not exist yet!\n"
msgstr "Partition %d finns inte än!\n"
-#: fdisk/fdisk.c:1266
+#: fdisk/fdisk.c:1278
msgid ""
"Type 0 means free space to many systems\n"
"(but not to Linux). Having partitions of\n"
@@ -2305,7 +2541,7 @@ msgstr ""
"oklokt. Du kan ta bort en partition\n"
"genom att använda kommandot \"d\".\n"
-#: fdisk/fdisk.c:1275
+#: fdisk/fdisk.c:1287
msgid ""
"You cannot change a partition into an extended one or vice versa\n"
"Delete it first.\n"
@@ -2313,7 +2549,7 @@ msgstr ""
"Du kan inte ändra en partition till en utökad partition eller tvärtom\n"
"Ta bort den först.\n"
-#: fdisk/fdisk.c:1284
+#: fdisk/fdisk.c:1296
msgid ""
"Consider leaving partition 3 as Whole disk (5),\n"
"as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2324,7 +2560,7 @@ msgstr ""
"gillar det.\n"
"\n"
-#: fdisk/fdisk.c:1290
+#: fdisk/fdisk.c:1302
msgid ""
"Consider leaving partition 9 as volume header (0),\n"
"and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2335,52 +2571,52 @@ msgstr ""
"förväntar sig det.\n"
"\n"
-#: fdisk/fdisk.c:1303
+#: fdisk/fdisk.c:1315
#, c-format
msgid "Changed system type of partition %d to %x (%s)\n"
msgstr "Ändrade systemtypen för partition %d till %x (%s)\n"
-#: fdisk/fdisk.c:1357
+#: fdisk/fdisk.c:1369
#, c-format
msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
msgstr "Partition %d har olika fysiska/logiska början (icke-Linux?):\n"
-#: fdisk/fdisk.c:1359 fdisk/fdisk.c:1367 fdisk/fdisk.c:1376 fdisk/fdisk.c:1385
+#: fdisk/fdisk.c:1371 fdisk/fdisk.c:1379 fdisk/fdisk.c:1388 fdisk/fdisk.c:1397
#, c-format
msgid " phys=(%d, %d, %d) "
msgstr " fys=(%d, %d, %d) "
-#: fdisk/fdisk.c:1360 fdisk/fdisk.c:1368
+#: fdisk/fdisk.c:1372 fdisk/fdisk.c:1380
#, c-format
msgid "logical=(%d, %d, %d)\n"
msgstr "logisk=(%d, %d, %d)\n"
-#: fdisk/fdisk.c:1365
+#: fdisk/fdisk.c:1377
#, c-format
msgid "Partition %d has different physical/logical endings:\n"
msgstr "Partition %d har olika fysiska/logiska slut:\n"
-#: fdisk/fdisk.c:1374
+#: fdisk/fdisk.c:1386
#, c-format
msgid "Partition %i does not start on cylinder boundary:\n"
msgstr "Partition %i börjar inte på cylindergräns:\n"
-#: fdisk/fdisk.c:1377
+#: fdisk/fdisk.c:1389
#, c-format
msgid "should be (%d, %d, 1)\n"
msgstr "borde vara (%d, %d, 1)\n"
-#: fdisk/fdisk.c:1383
+#: fdisk/fdisk.c:1395
#, c-format
msgid "Partition %i does not end on cylinder boundary:\n"
msgstr "Partition %i slutar inte på cylindergräns:\n"
-#: fdisk/fdisk.c:1386
+#: fdisk/fdisk.c:1398
#, c-format
msgid "should be (%d, %d, %d)\n"
msgstr "borde vara (%d, %d, %d)\n"
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1405
#, c-format
msgid ""
"\n"
@@ -2393,7 +2629,7 @@ msgstr ""
"Enheter = %s av %d * %d byte\n"
"\n"
-#: fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1513
msgid ""
"Nothing to do. Ordering is correct already.\n"
"\n"
@@ -2401,16 +2637,16 @@ msgstr ""
"Ingenting att göra. Ordningen är redan korrekt.\n"
"\n"
-#: fdisk/fdisk.c:1565
+#: fdisk/fdisk.c:1577
#, c-format
msgid "%*s Boot Start End Blocks Id System\n"
msgstr "%*s Start Början Slut Block Id System\n"
-#: fdisk/fdisk.c:1566 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:675
+#: fdisk/fdisk.c:1578 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:675
msgid "Device"
msgstr "Enhet"
-#: fdisk/fdisk.c:1603
+#: fdisk/fdisk.c:1615
msgid ""
"\n"
"Partition table entries are not in disk order\n"
@@ -2418,7 +2654,7 @@ msgstr ""
"\n"
"Posterna i partitionstabellen är inte i diskordning\n"
-#: fdisk/fdisk.c:1613
+#: fdisk/fdisk.c:1625
#, c-format
msgid ""
"\n"
@@ -2429,94 +2665,94 @@ msgstr ""
"Disk %s: %d huvuden, %d sektorer, %d cylindrar\n"
"\n"
-#: fdisk/fdisk.c:1615
+#: fdisk/fdisk.c:1627
msgid "Nr AF Hd Sec Cyl Hd Sec Cyl Start Size ID\n"
msgstr "Nr AF Hd Sek Cyl Hd Sek Cyl Början Strl ID\n"
-#: fdisk/fdisk.c:1659
+#: fdisk/fdisk.c:1671
#, c-format
msgid "Warning: partition %d contains sector 0\n"
msgstr "Varning: partition %d innehåller sektor 0\n"
-#: fdisk/fdisk.c:1662
+#: fdisk/fdisk.c:1674
#, c-format
msgid "Partition %d: head %d greater than maximum %d\n"
msgstr "Partition %d: huvud %d är större än maximala %d\n"
-#: fdisk/fdisk.c:1665
+#: fdisk/fdisk.c:1677
#, c-format
msgid "Partition %d: sector %d greater than maximum %d\n"
msgstr "Partition %d: sektor %d är större än maximala %d\n"
-#: fdisk/fdisk.c:1668
+#: fdisk/fdisk.c:1680
#, c-format
msgid "Partitions %d: cylinder %d greater than maximum %d\n"
msgstr "Partitioner %d: cylinder %d är större än maximala %d\n"
-#: fdisk/fdisk.c:1672
+#: fdisk/fdisk.c:1684
#, c-format
msgid "Partition %d: previous sectors %d disagrees with total %d\n"
msgstr ""
"Partition %d: tidigare sektorer %d stämmer inte överens med totala %d\n"
-#: fdisk/fdisk.c:1704
+#: fdisk/fdisk.c:1716
#, c-format
msgid "Warning: bad start-of-data in partition %d\n"
msgstr "Varning: felaktig databörjan på partition %d\n"
-#: fdisk/fdisk.c:1712
+#: fdisk/fdisk.c:1724
#, c-format
msgid "Warning: partition %d overlaps partition %d.\n"
msgstr "Varning: partition %d överlappar med partition %d.\n"
-#: fdisk/fdisk.c:1732
+#: fdisk/fdisk.c:1744
#, c-format
msgid "Warning: partition %d is empty\n"
msgstr "Varning: partition %d är tom\n"
-#: fdisk/fdisk.c:1737
+#: fdisk/fdisk.c:1749
#, c-format
msgid "Logical partition %d not entirely in partition %d\n"
msgstr "Logisk partition %d är inte helt inuti partition %d\n"
-#: fdisk/fdisk.c:1743
+#: fdisk/fdisk.c:1755
#, c-format
msgid "Total allocated sectors %d greater than the maximum %d\n"
msgstr "Totala antalet allokerade sektorer %d större än maximala %d\n"
-#: fdisk/fdisk.c:1746
+#: fdisk/fdisk.c:1758
#, c-format
msgid "%d unallocated sectors\n"
msgstr "%d oallokerade sektorer\n"
-#: fdisk/fdisk.c:1759 fdisk/fdisksgilabel.c:661 fdisk/fdisksunlabel.c:505
+#: fdisk/fdisk.c:1771 fdisk/fdisksgilabel.c:661 fdisk/fdisksunlabel.c:505
#, c-format
msgid "Partition %d is already defined. Delete it before re-adding it.\n"
msgstr ""
"Partition %d är redan definierad. Ta bort den innan du lägger till den "
"igen.\n"
-#: fdisk/fdisk.c:1780 fdisk/fdiskbsdlabel.c:279 fdisk/fdisksgilabel.c:683
+#: fdisk/fdisk.c:1792 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:683
#: fdisk/fdisksunlabel.c:520
#, c-format
msgid "First %s"
msgstr "Första %s"
-#: fdisk/fdisk.c:1795 fdisk/fdisksunlabel.c:561
+#: fdisk/fdisk.c:1807 fdisk/fdisksunlabel.c:561
#, c-format
msgid "Sector %d is already allocated\n"
msgstr "Sektor %d är redan allokerad\n"
-#: fdisk/fdisk.c:1831
+#: fdisk/fdisk.c:1843
msgid "No free sectors available\n"
msgstr "Inga lediga sektorer är tillgängliga\n"
-#: fdisk/fdisk.c:1840 fdisk/fdiskbsdlabel.c:286 fdisk/fdisksunlabel.c:572
+#: fdisk/fdisk.c:1852 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:572
#, c-format
msgid "Last %s or +size or +sizeM or +sizeK"
msgstr "Sista %s eller +storlek eller +storlekM eller +storlekK"
-#: fdisk/fdisk.c:1905
+#: fdisk/fdisk.c:1917
msgid ""
"\tSorry - this fdisk cannot handle AIX disk labels.\n"
"\tIf you want to add DOS-type partitions, create\n"
@@ -2529,16 +2765,16 @@ msgstr ""
"\tVARNING: Detta kommer att förstöra det nuvarande innehållet\n"
"\tpå disken.\n"
-#: fdisk/fdisk.c:1914 fdisk/fdiskbsdlabel.c:613
+#: fdisk/fdisk.c:1926 fdisk/fdiskbsdlabel.c:617
msgid "The maximum number of partitions has been created\n"
msgstr "Det maximala antalet partitioner har skapats\n"
-#: fdisk/fdisk.c:1924
+#: fdisk/fdisk.c:1936
msgid "You must delete some partition and add an extended partition first\n"
msgstr ""
"Du måste ta bort en partition och lägga till en utökad partition först\n"
-#: fdisk/fdisk.c:1929
+#: fdisk/fdisk.c:1941
#, c-format
msgid ""
"Command action\n"
@@ -2549,20 +2785,20 @@ msgstr ""
" %s\n"
" p primär partition (1-4)\n"
-#: fdisk/fdisk.c:1931
+#: fdisk/fdisk.c:1943
msgid "l logical (5 or over)"
msgstr "l logisk (5 eller högre)"
-#: fdisk/fdisk.c:1931
+#: fdisk/fdisk.c:1943
msgid "e extended"
msgstr "e utökad"
-#: fdisk/fdisk.c:1948
+#: fdisk/fdisk.c:1960
#, c-format
msgid "Invalid partition number for type `%c'\n"
msgstr "Ogiltigt partitionsnummer för typen \"%c\"\n"
-#: fdisk/fdisk.c:1984
+#: fdisk/fdisk.c:1996
msgid ""
"The partition table has been altered!\n"
"\n"
@@ -2570,11 +2806,11 @@ msgstr ""
"Partitionstabellen har ändrats!\n"
"\n"
-#: fdisk/fdisk.c:1993
+#: fdisk/fdisk.c:2005
msgid "Calling ioctl() to re-read partition table.\n"
msgstr "Anropar ioctl() för att läsa om partitionstabellen.\n"
-#: fdisk/fdisk.c:2009
+#: fdisk/fdisk.c:2021
#, c-format
msgid ""
"\n"
@@ -2587,7 +2823,7 @@ msgstr ""
"Kärnan använder fortfarande den gamla tabellen.\n"
"Den nya tabellen kommer att användas vid nästa omstart.\n"
-#: fdisk/fdisk.c:2019
+#: fdisk/fdisk.c:2031
msgid ""
"\n"
"WARNING: If you have created or modified any DOS 6.x\n"
@@ -2598,64 +2834,64 @@ msgstr ""
"VARNING: Om du har skapat eller ändrat någon DOS 6.x-partition\n"
"bör du läsa fdisk-manualsidan för ytterligare information.\n"
-#: fdisk/fdisk.c:2026
+#: fdisk/fdisk.c:2038
msgid "Syncing disks.\n"
msgstr "Synkroniserar hårddiskar.\n"
-#: fdisk/fdisk.c:2073
+#: fdisk/fdisk.c:2085
#, c-format
msgid "Partition %d has no data area\n"
msgstr "Partition %d har inget dataområde\n"
-#: fdisk/fdisk.c:2078
+#: fdisk/fdisk.c:2090
msgid "New beginning of data"
msgstr "Ny början utav data"
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2106
msgid "Expert command (m for help): "
msgstr "Expertkommando (m för hjälp): "
-#: fdisk/fdisk.c:2107
+#: fdisk/fdisk.c:2119
msgid "Number of cylinders"
msgstr "Antal cylindrar"
-#: fdisk/fdisk.c:2134
+#: fdisk/fdisk.c:2146
msgid "Number of heads"
msgstr "Antal huvuden"
-#: fdisk/fdisk.c:2159
+#: fdisk/fdisk.c:2171
msgid "Number of sectors"
msgstr "Antal sektorer"
-#: fdisk/fdisk.c:2162
+#: fdisk/fdisk.c:2174
msgid "Warning: setting sector offset for DOS compatiblity\n"
msgstr "Varning: ställer in sektoravstånd för DOS-kompatibilitet\n"
-#: fdisk/fdisk.c:2237
+#: fdisk/fdisk.c:2249
#, c-format
msgid "Disk %s doesn't contain a valid partition table\n"
msgstr "Disk %s innehåller inte en giltig partitionstabell\n"
-#: fdisk/fdisk.c:2251
+#: fdisk/fdisk.c:2263
#, c-format
msgid "Cannot open %s\n"
msgstr "Kan inte öppna %s\n"
-#: fdisk/fdisk.c:2267 fdisk/sfdisk.c:2363
+#: fdisk/fdisk.c:2279 fdisk/sfdisk.c:2363
#, c-format
msgid "cannot open %s\n"
msgstr "kan inte öppna %s\n"
-#: fdisk/fdisk.c:2289
+#: fdisk/fdisk.c:2301
#, c-format
msgid "%c: unknown command\n"
msgstr "%c: okänt kommando\n"
-#: fdisk/fdisk.c:2339
+#: fdisk/fdisk.c:2351
msgid "This kernel finds the sector size itself - -b option ignored\n"
msgstr "Denna kärna hittar själv sektorstorleken - flaggan -b ignoreras\n"
-#: fdisk/fdisk.c:2342
+#: fdisk/fdisk.c:2355
msgid ""
"Warning: the -b (set sector size) option should be used with one specified "
"device\n"
@@ -2663,20 +2899,19 @@ msgstr ""
"Varning: flaggan -b (ställ in sektorstorlek) måste användas med en angiven "
"enhet\n"
-#: fdisk/fdisk.c:2405
-#, c-format
-msgid ""
-"Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
-"To return to DOS partition table mode, use the 'r' command.\n"
+#. OSF label, and no DOS label
+#: fdisk/fdisk.c:2414
+#, fuzzy, c-format
+msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
msgstr ""
"Upptäckte en OSF/1-disketikett på %s, går in i disketikettsläge.\n"
"För att återgå till DOS-partitionstabelläge använder du kommandot \"r\".\n"
-#: fdisk/fdisk.c:2413
+#: fdisk/fdisk.c:2424
msgid "Command (m for help): "
msgstr "Kommando (m för hjälp): "
-#: fdisk/fdisk.c:2429
+#: fdisk/fdisk.c:2440
#, c-format
msgid ""
"\n"
@@ -2685,15 +2920,15 @@ msgstr ""
"\n"
"Aktuell startfil är: %s\n"
-#: fdisk/fdisk.c:2431
+#: fdisk/fdisk.c:2442
msgid "Please enter the name of the new boot file: "
msgstr "Ange namnet på den nya startfilen: "
-#: fdisk/fdisk.c:2433
+#: fdisk/fdisk.c:2444
msgid "Boot file unchanged\n"
msgstr "Startfilen oförändrad\n"
-#: fdisk/fdisk.c:2497
+#: fdisk/fdisk.c:2508
msgid ""
"\n"
"\tSorry, no experts menu for SGI partition tables available.\n"
@@ -2732,7 +2967,7 @@ msgstr ""
"\t försäkra dig om att du logiskt tar bort disken\n"
"\t från din AIX-maskin (annars blir du en AIXpert)."
-#: fdisk/fdiskbsdlabel.c:117
+#: fdisk/fdiskbsdlabel.c:122
#, c-format
msgid ""
"\n"
@@ -2741,167 +2976,167 @@ msgstr ""
"\n"
"BSD-etikett för enhet: %s\n"
-#: fdisk/fdiskbsdlabel.c:125
+#: fdisk/fdiskbsdlabel.c:130
msgid " d delete a BSD partition"
msgstr " d ta bort en BSD-partition"
-#: fdisk/fdiskbsdlabel.c:126
+#: fdisk/fdiskbsdlabel.c:131
msgid " e edit drive data"
msgstr " e redigera enhetsdata"
-#: fdisk/fdiskbsdlabel.c:127
+#: fdisk/fdiskbsdlabel.c:132
msgid " i install bootstrap"
msgstr " i installera förstartare (bootstrap)"
-#: fdisk/fdiskbsdlabel.c:128
+#: fdisk/fdiskbsdlabel.c:133
msgid " l list known filesystem types"
msgstr " l visa kända filsystemstyper"
-#: fdisk/fdiskbsdlabel.c:130
+#: fdisk/fdiskbsdlabel.c:135
msgid " n add a new BSD partition"
msgstr " n lägg till en ny BSD-partition"
-#: fdisk/fdiskbsdlabel.c:131
+#: fdisk/fdiskbsdlabel.c:136
msgid " p print BSD partition table"
msgstr " p skriv ut BSD-partitionstabell"
-#: fdisk/fdiskbsdlabel.c:134
+#: fdisk/fdiskbsdlabel.c:139
msgid " s show complete disklabel"
msgstr " s visa fullständig disketikett"
-#: fdisk/fdiskbsdlabel.c:135
+#: fdisk/fdiskbsdlabel.c:140
msgid " t change a partition's filesystem id"
msgstr " t ändra en partitions filsystemsid"
-#: fdisk/fdiskbsdlabel.c:136
+#: fdisk/fdiskbsdlabel.c:141
msgid " u change units (cylinders/sectors)"
msgstr " u byt enheter (cylindrar/sektorer)"
-#: fdisk/fdiskbsdlabel.c:137
+#: fdisk/fdiskbsdlabel.c:142
msgid " w write disklabel to disk"
msgstr " w skriv disketikett till disk"
-#: fdisk/fdiskbsdlabel.c:139
+#: fdisk/fdiskbsdlabel.c:144
msgid " x link BSD partition to non-BSD partition"
msgstr " x länka BSD-partition till icke-BSD-partition"
-#: fdisk/fdiskbsdlabel.c:171
+#: fdisk/fdiskbsdlabel.c:176
#, c-format
msgid "Partition %s has invalid starting sector 0.\n"
msgstr "Partitionen %s har ogiltig startsektor 0.\n"
-#: fdisk/fdiskbsdlabel.c:175
+#: fdisk/fdiskbsdlabel.c:180
#, c-format
msgid "Reading disklabel of %s at sector %d.\n"
msgstr "Läser disketikett för %s vid sektor %d.\n"
-#: fdisk/fdiskbsdlabel.c:185
+#: fdisk/fdiskbsdlabel.c:190
#, c-format
msgid "There is no *BSD partition on %s.\n"
msgstr "Det finns ingen *BSD-partition på %s.\n"
-#: fdisk/fdiskbsdlabel.c:199
+#: fdisk/fdiskbsdlabel.c:204
msgid "BSD disklabel command (m for help): "
msgstr "BSD-disketikettskommando (m för hjälp): "
-#: fdisk/fdiskbsdlabel.c:313
+#: fdisk/fdiskbsdlabel.c:318
#, c-format
msgid "type: %s\n"
msgstr "typ: %s\n"
-#: fdisk/fdiskbsdlabel.c:315
+#: fdisk/fdiskbsdlabel.c:320
#, c-format
msgid "type: %d\n"
msgstr "typ: %d\n"
-#: fdisk/fdiskbsdlabel.c:316
+#: fdisk/fdiskbsdlabel.c:321
#, c-format
msgid "disk: %.*s\n"
msgstr "disk: %.*s\n"
-#: fdisk/fdiskbsdlabel.c:317
+#: fdisk/fdiskbsdlabel.c:322
#, c-format
msgid "label: %.*s\n"
msgstr "etikett: %.*s\n"
-#: fdisk/fdiskbsdlabel.c:318
+#: fdisk/fdiskbsdlabel.c:323
msgid "flags:"
msgstr "flaggor:"
-#: fdisk/fdiskbsdlabel.c:320
+#: fdisk/fdiskbsdlabel.c:325
msgid " removable"
msgstr " löstagbar"
-#: fdisk/fdiskbsdlabel.c:322
+#: fdisk/fdiskbsdlabel.c:327
msgid " ecc"
msgstr " ecc"
-#: fdisk/fdiskbsdlabel.c:324
+#: fdisk/fdiskbsdlabel.c:329
msgid " badsect"
msgstr " felsekt"
#. On various machines the fields of *lp are short/int/long
#. In order to avoid problems, we cast them all to long.
-#: fdisk/fdiskbsdlabel.c:328
+#: fdisk/fdiskbsdlabel.c:333
#, c-format
msgid "bytes/sector: %ld\n"
msgstr "byte/sektor: %ld\n"
-#: fdisk/fdiskbsdlabel.c:329
+#: fdisk/fdiskbsdlabel.c:334
#, c-format
msgid "sectors/track: %ld\n"
msgstr "sektorer/spår: %ld\n"
-#: fdisk/fdiskbsdlabel.c:330
+#: fdisk/fdiskbsdlabel.c:335
#, c-format
msgid "tracks/cylinder: %ld\n"
msgstr "spår/cylinder: %ld\n"
-#: fdisk/fdiskbsdlabel.c:331
+#: fdisk/fdiskbsdlabel.c:336
#, c-format
msgid "sectors/cylinder: %ld\n"
msgstr "sektorer/cylinder: %ld\n"
-#: fdisk/fdiskbsdlabel.c:332
+#: fdisk/fdiskbsdlabel.c:337
#, c-format
msgid "cylinders: %ld\n"
msgstr "cylindrar: %ld\n"
-#: fdisk/fdiskbsdlabel.c:333
+#: fdisk/fdiskbsdlabel.c:338
#, c-format
msgid "rpm: %d\n"
msgstr "varv per minut: %d\n"
-#: fdisk/fdiskbsdlabel.c:334
+#: fdisk/fdiskbsdlabel.c:339
#, c-format
msgid "interleave: %d\n"
msgstr "mellanrum: %d\n"
-#: fdisk/fdiskbsdlabel.c:335
+#: fdisk/fdiskbsdlabel.c:340
#, c-format
msgid "trackskew: %d\n"
msgstr "spårförskjutning: %d\n"
-#: fdisk/fdiskbsdlabel.c:336
+#: fdisk/fdiskbsdlabel.c:341
#, c-format
msgid "cylinderskew: %d\n"
msgstr "cylinderförskjutning: %d\n"
-#: fdisk/fdiskbsdlabel.c:337
+#: fdisk/fdiskbsdlabel.c:342
#, c-format
msgid "headswitch: %ld\t\t# milliseconds\n"
msgstr "huvudbyte: %ld\t\tantal millisekunder\n"
-#: fdisk/fdiskbsdlabel.c:339
+#: fdisk/fdiskbsdlabel.c:344
#, c-format
msgid "track-to-track seek: %ld\t# milliseconds\n"
msgstr "spår-till-spår-sökning: %ld\tantal millisekunder\n"
-#: fdisk/fdiskbsdlabel.c:341
+#: fdisk/fdiskbsdlabel.c:346
msgid "drivedata: "
msgstr "enhetsdata: "
-#: fdisk/fdiskbsdlabel.c:350
+#: fdisk/fdiskbsdlabel.c:355
#, c-format
msgid ""
"\n"
@@ -2910,97 +3145,97 @@ msgstr ""
"\n"
"%d partitioner:\n"
-#: fdisk/fdiskbsdlabel.c:351
+#: fdisk/fdiskbsdlabel.c:356
msgid "# start end size fstype [fsize bsize cpg]\n"
msgstr "# början slut storlek fs-typ [fstrl bstrl cpg]\n"
-#: fdisk/fdiskbsdlabel.c:400 fdisk/fdiskbsdlabel.c:403
+#: fdisk/fdiskbsdlabel.c:405 fdisk/fdiskbsdlabel.c:408
#, c-format
msgid "Writing disklabel to %s.\n"
msgstr "Skriver disketikett till %s.\n"
-#: fdisk/fdiskbsdlabel.c:415 fdisk/fdiskbsdlabel.c:417
+#: fdisk/fdiskbsdlabel.c:420 fdisk/fdiskbsdlabel.c:422
#, c-format
msgid "%s contains no disklabel.\n"
msgstr "%s innehåller ingen disketikett.\n"
-#: fdisk/fdiskbsdlabel.c:422
+#: fdisk/fdiskbsdlabel.c:427
msgid "Do you want to create a disklabel? (y/n) "
msgstr "Vill du skapa en disketikett? (y/n) "
-#: fdisk/fdiskbsdlabel.c:461
+#: fdisk/fdiskbsdlabel.c:466
msgid "bytes/sector"
msgstr "byte/sektor"
-#: fdisk/fdiskbsdlabel.c:462
+#: fdisk/fdiskbsdlabel.c:467
msgid "sectors/track"
msgstr "sektorer/spår"
-#: fdisk/fdiskbsdlabel.c:463
+#: fdisk/fdiskbsdlabel.c:468
msgid "tracks/cylinder"
msgstr "spår/cylinder"
-#: fdisk/fdiskbsdlabel.c:471
+#: fdisk/fdiskbsdlabel.c:476
msgid "sectors/cylinder"
msgstr "sektorer/cylinder"
-#: fdisk/fdiskbsdlabel.c:475
+#: fdisk/fdiskbsdlabel.c:480
msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
msgstr "Måste vara <= sektorer/spår × spår/cylinder (standard).\n"
-#: fdisk/fdiskbsdlabel.c:477
+#: fdisk/fdiskbsdlabel.c:482
msgid "rpm"
msgstr "varv per minut"
-#: fdisk/fdiskbsdlabel.c:478
+#: fdisk/fdiskbsdlabel.c:483
msgid "interleave"
msgstr "mellanrum"
-#: fdisk/fdiskbsdlabel.c:479
+#: fdisk/fdiskbsdlabel.c:484
msgid "trackskew"
msgstr "spårförskjutning"
-#: fdisk/fdiskbsdlabel.c:480
+#: fdisk/fdiskbsdlabel.c:485
msgid "cylinderskew"
msgstr "cylinderförskjutning"
-#: fdisk/fdiskbsdlabel.c:481
+#: fdisk/fdiskbsdlabel.c:486
msgid "headswitch"
msgstr "huvudbytye"
-#: fdisk/fdiskbsdlabel.c:482
+#: fdisk/fdiskbsdlabel.c:487
msgid "track-to-track seek"
msgstr "spår-till-spår-sökning"
-#: fdisk/fdiskbsdlabel.c:523
+#: fdisk/fdiskbsdlabel.c:528
#, c-format
msgid "Bootstrap: %sboot -> boot%s (%s): "
msgstr "Förstartare (bootstrap): %sboot -> boot%s (%s): "
-#: fdisk/fdiskbsdlabel.c:548
+#: fdisk/fdiskbsdlabel.c:553
msgid "Bootstrap overlaps with disk label!\n"
msgstr "Förstartare (bootstrap) överlappar med disketikett!\n"
-#: fdisk/fdiskbsdlabel.c:569 fdisk/fdiskbsdlabel.c:571
+#: fdisk/fdiskbsdlabel.c:574 fdisk/fdiskbsdlabel.c:576
#, c-format
msgid "Bootstrap installed on %s.\n"
msgstr "Förstartare (bootstrap) installerad på %s.\n"
-#: fdisk/fdiskbsdlabel.c:593
+#: fdisk/fdiskbsdlabel.c:598
#, c-format
msgid "Partition (a-%c): "
msgstr "Partition (a-%c): "
-#: fdisk/fdiskbsdlabel.c:624
+#: fdisk/fdiskbsdlabel.c:629
msgid "This partition already exists.\n"
msgstr "Denna partition finns redan.\n"
-#: fdisk/fdiskbsdlabel.c:744
+#: fdisk/fdiskbsdlabel.c:755
#, c-format
msgid "Warning: too many partitions (%d, maximum is %d).\n"
msgstr "Varning: för många partitioner (%d, max är %d).\n"
-#: fdisk/fdiskbsdlabel.c:791
+#: fdisk/fdiskbsdlabel.c:803
msgid ""
"\n"
"Syncing disks.\n"
@@ -4948,135 +5183,121 @@ msgstr "getopt (utökad) 1.1.2\n"
msgid "internal error, contact the author."
msgstr "internt fel, kontakta författaren."
-#: hwclock/cmos.c:168
+#: hwclock/cmos.c:172
msgid "booted from MILO\n"
msgstr "startade från MILO\n"
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:181
msgid "Ruffian BCD clock\n"
msgstr "Ruffian BCD-klocka\n"
-#: hwclock/cmos.c:193
+#: hwclock/cmos.c:197
#, c-format
msgid "clockport adjusted to 0x%x\n"
msgstr "klockporten justerades till 0x%x\n"
-#: hwclock/cmos.c:205
+#: hwclock/cmos.c:209
msgid "funky TOY!\n"
msgstr "häftig LEKSAK!\n"
-#: hwclock/cmos.c:259
+#: hwclock/cmos.c:263
#, c-format
msgid "%s: atomic %s failed for 1000 iterations!"
msgstr "%s: atomisk %s misslyckades för 1000 iterationer!"
-#: hwclock/cmos.c:583
+#: hwclock/cmos.c:587
#, c-format
msgid "Cannot open /dev/port: %s"
msgstr "Kan inte öppna /dev/port: %s"
-#: hwclock/cmos.c:590
+#: hwclock/cmos.c:594
msgid "I failed to get permission because I didn't try.\n"
msgstr "Jag misslyckades med att få tillåtelse eftersom jag inte försökte.\n"
-#: hwclock/cmos.c:593
+#: hwclock/cmos.c:597
#, c-format
msgid "%s is unable to get I/O port access: the iopl(3) call failed.\n"
msgstr "%s kan inte få I/O-porttillgång: iopl(3)-anropet misslyckades.\n"
-#: hwclock/cmos.c:596
+#: hwclock/cmos.c:600
msgid "Probably you need root privileges.\n"
msgstr "Du behöver troligtvis root-privilegier.\n"
-#: hwclock/hwclock.c:219
+#: hwclock/hwclock.c:223
#, c-format
msgid "Assuming hardware clock is kept in %s time.\n"
msgstr "Antar att hårdvaruklockan håller %s-tid.\n"
-#: hwclock/hwclock.c:220 hwclock/hwclock.c:314
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
msgid "UTC"
msgstr "UTC"
-#: hwclock/hwclock.c:220 hwclock/hwclock.c:313
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
msgid "local"
msgstr "lokal"
-#: hwclock/hwclock.c:297
+#: hwclock/hwclock.c:303
#, c-format
msgid "%s: Warning: unrecognized third line in adjtime file\n"
msgstr "%s: Varning: okänd tredje rad i adjtime-fil\n"
-#: hwclock/hwclock.c:299
+#: hwclock/hwclock.c:305
msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
msgstr "(Förväntade: \"UTC\" eller \"LOCAL\" eller ingenting.)\n"
-#: hwclock/hwclock.c:308
+#: hwclock/hwclock.c:312
#, c-format
msgid "Last drift adjustment done at %ld seconds after 1969\n"
msgstr "Senaste dragningsjustering gjordes %ld sekunder efter 1969\n"
-#: hwclock/hwclock.c:310
+#: hwclock/hwclock.c:314
#, c-format
msgid "Last calibration done at %ld seconds after 1969\n"
msgstr "Senaste kalibrering gjordes %ld sekunder efter 1969\n"
-#: hwclock/hwclock.c:312
+#: hwclock/hwclock.c:316
#, c-format
msgid "Hardware clock is on %s time\n"
msgstr "Hårdvaruklockan håller %s-tid\n"
-#: hwclock/hwclock.c:314
+#: hwclock/hwclock.c:318
msgid "unknown"
msgstr "okänd"
-#. -----------------------------------------------------------------------------
-#. 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.
-#.
-#. -----------------------------------------------------------------------------
-#: hwclock/hwclock.c:336
+#: hwclock/hwclock.c:342
msgid "Waiting for clock tick...\n"
msgstr "Väntar på klocktick...\n"
-#: hwclock/hwclock.c:340
+#: hwclock/hwclock.c:346
msgid "...got clock tick\n"
msgstr "...fick klocktick\n"
-#: hwclock/hwclock.c:391
+#: hwclock/hwclock.c:399
#, c-format
msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
msgstr "Ogiltiga värden i hårdvaruklockan: %4d-%.2d-%.2d %.2d.%.2d.%.2d\n"
-#: hwclock/hwclock.c:399
+#: hwclock/hwclock.c:407
#, c-format
msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
msgstr "Hv-klocktid: %4d-%.2d-%.2d %.2d.%.2d.%.2d = %ld sekunder sedan 1969\n"
-#: hwclock/hwclock.c:427
+#: hwclock/hwclock.c:435
#, c-format
msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
msgstr "Tid som lästs från hårdvaruklockan: %4d-%.2d-%.2d %02d.%02d.%02d\n"
-#: hwclock/hwclock.c:454
+#: hwclock/hwclock.c:462
#, c-format
msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
msgstr ""
"Ställer hårdvaruklockan till %.2d.%.2d.%.2d = %ld sekunder sedan 1969\n"
-#: hwclock/hwclock.c:460
+#: hwclock/hwclock.c:468
msgid "Clock not changed - testing only.\n"
msgstr "Klockan är inte ändrad - testar bara.\n"
-#: hwclock/hwclock.c:508
+#: hwclock/hwclock.c:516
#, c-format
msgid ""
"Time elapsed since reference time has been %.6f seconds.\n"
@@ -5085,7 +5306,7 @@ msgstr ""
"Tid som har gått sedan referenstiden är %.6f sekunder.\n"
"Fördröjer ytterligare för att nå nästa hela sekund.\n"
-#: hwclock/hwclock.c:532
+#: hwclock/hwclock.c:540
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"
@@ -5094,20 +5315,20 @@ msgstr ""
"50:e dagen i månaden) eller utanför det intervall som vi kan hantera (t.ex. "
"år 2095).\n"
-#: hwclock/hwclock.c:542
+#: hwclock/hwclock.c:550
#, c-format
msgid "%s %.6f seconds\n"
msgstr "%s %.6f sekunder\n"
-#: hwclock/hwclock.c:576
+#: hwclock/hwclock.c:584
msgid "No --date option specified.\n"
msgstr "Ingen --date-flagga angavs.\n"
-#: hwclock/hwclock.c:582
+#: hwclock/hwclock.c:590
msgid "--date argument too long\n"
msgstr "--date-argumentet är för långt\n"
-#: hwclock/hwclock.c:589
+#: hwclock/hwclock.c:597
msgid ""
"The value of the --date option is not a valid date.\n"
"In particular, it contains quotation marks.\n"
@@ -5115,22 +5336,22 @@ msgstr ""
"Värdet i --date-flaggan är ogiltigt.\n"
"I synnerhet som det innehåller citationstecken.\n"
-#: hwclock/hwclock.c:597
+#: hwclock/hwclock.c:605
#, c-format
msgid "Issuing date command: %s\n"
msgstr "Anropar date-kommandot: %s\n"
-#: hwclock/hwclock.c:601
+#: hwclock/hwclock.c:609
msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
msgstr ""
"Kan inte köra \"date\"-programmet i skalet /bin/sh. popen() misslyckades"
-#: hwclock/hwclock.c:609
+#: hwclock/hwclock.c:617
#, c-format
msgid "response from date command = %s\n"
msgstr "svar från date-kommandot = %s\n"
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:619
#, c-format
msgid ""
"The date command issued by %s returned unexpected results.\n"
@@ -5145,7 +5366,7 @@ msgstr ""
"Svaret var:\n"
" %s\n"
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:631
#, c-format
msgid ""
"The date command issued by %s returned something other than an integer where "
@@ -5162,12 +5383,12 @@ msgstr ""
"Svaret var:\n"
" %s\n"
-#: hwclock/hwclock.c:634
+#: hwclock/hwclock.c:642
#, c-format
msgid "date string %s equates to %ld seconds since 1969.\n"
msgstr "datumsträngen %s är lika med %ld sekunder sedan 1969.\n"
-#: hwclock/hwclock.c:666
+#: hwclock/hwclock.c:674
msgid ""
"The Hardware Clock does not contain a valid time, so we cannot set the "
"System Time from it.\n"
@@ -5175,33 +5396,33 @@ msgstr ""
"Hårdvaruklockan innehåller inte en giltig tid, så vi kan inte ställa "
"systemtiden med den.\n"
-#: hwclock/hwclock.c:688
+#: hwclock/hwclock.c:696
msgid "Calling settimeofday:\n"
msgstr "Anropar settimeofday:\n"
-#: hwclock/hwclock.c:689
+#: hwclock/hwclock.c:697
#, c-format
msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
-#: hwclock/hwclock.c:691
+#: hwclock/hwclock.c:699
#, c-format
msgid "\ttz.tz_minuteswest = %d\n"
msgstr "\ttz.tz_minuteswest = %d\n"
-#: hwclock/hwclock.c:694
+#: hwclock/hwclock.c:702
msgid "Not setting system clock because running in test mode.\n"
msgstr "Ställer inte systemklockan eftersom vi kör i testläge.\n"
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:711
msgid "Must be superuser to set system clock.\n"
msgstr "Måste vara superanvändaren för att kunna ställa systemklockan.\n"
-#: hwclock/hwclock.c:704
+#: hwclock/hwclock.c:714
msgid "settimeofday() failed"
msgstr "settimeofday() misslyckades"
-#: hwclock/hwclock.c:737
+#: hwclock/hwclock.c:744
msgid ""
"Not adjusting drift factor because the Hardware Clock previously contained "
"garbage.\n"
@@ -5209,7 +5430,16 @@ msgstr ""
"Justerar inte dragningsfaktorn eftersom hårdvaruklockan tidigare innehöll "
"skräp.\n"
-#: hwclock/hwclock.c:741
+#: hwclock/hwclock.c:749
+#, fuzzy
+msgid ""
+"Not adjusting drift factor because last calibration time is zero,\n"
+"so history is bad and calibration startover is necessary.\n"
+msgstr ""
+"Justerar inte dragningsfaktorn eftersom det har gått mindre än en dag sedan "
+"den senaste kalibreringen.\n"
+
+#: hwclock/hwclock.c:755
msgid ""
"Not adjusting drift factor because it has been less than a day since the "
"last calibration.\n"
@@ -5217,10 +5447,10 @@ msgstr ""
"Justerar inte dragningsfaktorn eftersom det har gått mindre än en dag sedan "
"den senaste kalibreringen.\n"
-#: hwclock/hwclock.c:750
-#, c-format
+#: hwclock/hwclock.c:803
+#, fuzzy, c-format
msgid ""
-"Clock drifted %d seconds in the past %d seconds in spite of a drift factor "
+"Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
"of %f seconds/day.\n"
"Adjusting drift factor by %f seconds/day\n"
msgstr ""
@@ -5228,23 +5458,23 @@ msgstr ""
"dragningsfaktor på %f sekunder/dag.\n"
"Justerar dragningsfaktorn med %f sekunder/dag\n"
-#: hwclock/hwclock.c:801
+#: hwclock/hwclock.c:854
#, c-format
msgid "Time since last adjustment is %d seconds\n"
msgstr "Tid sedan senaste justeringen är %d sekunder\n"
-#: hwclock/hwclock.c:803
+#: hwclock/hwclock.c:856
#, c-format
msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
msgstr ""
"Behöver infoga %d sekunder och referera tillbaka i tiden %.6f sekunder "
"sedan\n"
-#: hwclock/hwclock.c:832
+#: hwclock/hwclock.c:885
msgid "Not updating adjtime file because of testing mode.\n"
msgstr "Uppdaterar inte adjtime-filen eftersom vi är i testläge.\n"
-#: hwclock/hwclock.c:833
+#: hwclock/hwclock.c:886
#, c-format
msgid ""
"Would have written the following to %s:\n"
@@ -5253,35 +5483,35 @@ msgstr ""
"Skulle skrivit följande till %s:\n"
"%s"
-#: hwclock/hwclock.c:857
+#: hwclock/hwclock.c:910
msgid "Drift adjustment parameters not updated.\n"
msgstr "Dragningsjusteringsparametrarna uppdaterades inte.\n"
-#: hwclock/hwclock.c:898
+#: hwclock/hwclock.c:951
msgid ""
"The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
msgstr ""
"Hårdvaruklockan innehåller inte giltig tid, så vi kan inte justera den.\n"
-#: hwclock/hwclock.c:922
+#: hwclock/hwclock.c:983
msgid "Needed adjustment is less than one second, so not setting clock.\n"
msgstr ""
"Den justering som behövs är mindre än en sekund, så ställer inte klockan.\n"
-#: hwclock/hwclock.c:948
+#: hwclock/hwclock.c:1009
#, c-format
msgid "Using %s.\n"
msgstr "Använder %s.\n"
-#: hwclock/hwclock.c:950
+#: hwclock/hwclock.c:1011
msgid "No usable clock interface found.\n"
msgstr "Inget användbart klockgränssnitt hittades.\n"
-#: hwclock/hwclock.c:1045
+#: hwclock/hwclock.c:1107
msgid "Unable to set system clock.\n"
msgstr "Kunde inte ställa systemklockan.\n"
-#: hwclock/hwclock.c:1076
+#: hwclock/hwclock.c:1137
msgid ""
"The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
"machine.\n"
@@ -5292,16 +5522,16 @@ msgstr ""
"Denna kopia av hwclock byggdes för en annan maskin än Alpha\n"
"(och körs därför troligen inte på en Alpha just nu). Ingen åtgärd utfördes.\n"
-#: hwclock/hwclock.c:1085
+#: hwclock/hwclock.c:1146
msgid "Unable to get the epoch value from the kernel.\n"
msgstr "Kunde inte få tag i epokvärdet från kärnan.\n"
-#: hwclock/hwclock.c:1087
+#: hwclock/hwclock.c:1148
#, c-format
msgid "Kernel is assuming an epoch value of %lu\n"
msgstr "Kärnan antar att epokvärdet är %lu\n"
-#: hwclock/hwclock.c:1090
+#: hwclock/hwclock.c:1151
msgid ""
"To set the epoch value, you must use the 'epoch' option to tell to what "
"value to set it.\n"
@@ -5309,16 +5539,16 @@ msgstr ""
"För att ställa epokvärdet måste du använda flaggan \"epoch\" för att ange "
"vilket värde det ska ställas till.\n"
-#: hwclock/hwclock.c:1093
+#: hwclock/hwclock.c:1154
#, c-format
msgid "Not setting the epoch to %d - testing only.\n"
msgstr "Ställer inte epoken till %d - testar bara.\n"
-#: hwclock/hwclock.c:1096
+#: hwclock/hwclock.c:1157
msgid "Unable to set the epoch value in the kernel.\n"
msgstr "Kan inte ställa in epokvärdet i kärnan.\n"
-#: hwclock/hwclock.c:1125
+#: hwclock/hwclock.c:1191
#, c-format
msgid ""
"hwclock - query and set the hardware clock (RTC)\n"
@@ -5376,7 +5606,7 @@ msgstr ""
" --noadjfile försök inte komma åt /etc/adjtime. Kräver att antingen\n"
" --utc eller --localtime används\n"
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1218
msgid ""
" --jensen, --arc, --srm, --funky-toy\n"
" tell hwclock the type of alpha you have (see hwclock(8))\n"
@@ -5385,20 +5615,21 @@ msgstr ""
" tala om för hwclock vilken typ av alpha du har (se hwclock"
"(8))\n"
-#: hwclock/hwclock.c:1257
+#: hwclock/hwclock.c:1392
#, c-format
msgid "%s takes no non-option arguments. You supplied %d.\n"
msgstr "%s tar inga argument som inte är flaggor. Du angav %d.\n"
-#: hwclock/hwclock.c:1267
+#: hwclock/hwclock.c:1398
+#, fuzzy
msgid ""
-"You have specified multiple function options.\n"
+"You have specified multiple functions.\n"
"You can only perform one function at a time.\n"
msgstr ""
"Du har angivit flera funktionsflaggor.\n"
"Du kan bara utföra en funktion åt gången.\n"
-#: hwclock/hwclock.c:1273
+#: hwclock/hwclock.c:1405
#, c-format
msgid ""
"%s: The --utc and --localtime options are mutually exclusive. You specified "
@@ -5407,7 +5638,7 @@ msgstr ""
"%s: Flaggorna --utc och --localtime är ömsesidigt uteslutande. Du angav "
"båda.\n"
-#: hwclock/hwclock.c:1279
+#: hwclock/hwclock.c:1412
#, c-format
msgid ""
"%s: The --adjust and --noadjfile options are mutually exclusive. You "
@@ -5416,35 +5647,35 @@ msgstr ""
"%s: Flaggorna --adjust och --noadjfile är ömsesidigt uteslutande. Du angav "
"båda.\n"
-#: hwclock/hwclock.c:1285
+#: hwclock/hwclock.c:1419
#, c-format
msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
msgstr "%s: Med --noadjfile måste du ange antingen --utc eller --localtime\n"
-#: hwclock/hwclock.c:1298
+#: hwclock/hwclock.c:1433
msgid "No usable set-to time. Cannot set clock.\n"
msgstr "Ingen användbar tid att ställa. Kan inte ställa klockan.\n"
-#: hwclock/hwclock.c:1313
+#: hwclock/hwclock.c:1449
msgid "Sorry, only the superuser can change the Hardware Clock.\n"
msgstr "Tyvärr, endast superanvändaren kan ändra hårdvaruklockan.\n"
-#: hwclock/hwclock.c:1317
+#: hwclock/hwclock.c:1454
msgid "Sorry, only the superuser can change the System Clock.\n"
msgstr "Tyvärr, endast superanvändaren kan ändra systemklockan.\n"
-#: hwclock/hwclock.c:1321
+#: hwclock/hwclock.c:1459
msgid ""
"Sorry, only the superuser can change the Hardware Clock epoch in the "
"kernel.\n"
msgstr ""
"Tyvärr, endast superanvändaren kan ändra hårdvaruklockans epok i kärnan.\n"
-#: hwclock/hwclock.c:1341
+#: hwclock/hwclock.c:1479
msgid "Cannot access the Hardware Clock via any known method.\n"
msgstr "Kan inte komma åt hårdvaruklockan via någon känd metod.\n"
-#: hwclock/hwclock.c:1344
+#: hwclock/hwclock.c:1483
msgid ""
"Use the --debug option to see the details of our search for an access "
"method.\n"
@@ -5452,95 +5683,90 @@ msgstr ""
"Använd flaggan --debug för att se detaljerna över vår sökning efter en "
"åtkomstmetod.\n"
-#: hwclock/kd.c:42
+#: hwclock/kd.c:43
msgid "Waiting in loop for time from KDGHWCLK to change\n"
msgstr "Väntar i slingan på att tiden från KDGHWCLK ska ändras\n"
-#: hwclock/kd.c:45
+#: hwclock/kd.c:46
msgid "KDGHWCLK ioctl to read time failed"
msgstr "KDGHWCLK-ioctl för att läsa tid misslyckades"
-#: hwclock/kd.c:66 hwclock/rtc.c:174
+#: hwclock/kd.c:67 hwclock/rtc.c:187
msgid "Timed out waiting for time change.\n"
msgstr "Gjorde time-out under väntan på att tiden skulle ändras.\n"
-#: hwclock/kd.c:70
+#: hwclock/kd.c:71
msgid "KDGHWCLK ioctl to read time failed in loop"
msgstr "KDGHWCLK-ioctl för att läsa tid misslyckades i slingan"
-#: hwclock/kd.c:92
+#: hwclock/kd.c:93
#, c-format
msgid "ioctl() failed to read time from %s"
msgstr "ioctl() misslyckades med att läsa tid från %s"
-#: hwclock/kd.c:128
+#: hwclock/kd.c:129
msgid "ioctl KDSHWCLK failed"
msgstr "KDSHWCLK-ioctl misslyckades"
-#: hwclock/kd.c:165
+#: hwclock/kd.c:166
msgid "Can't open /dev/tty1 or /dev/vc/1"
msgstr "Kan inte öppna /dev/tty1 eller /dev/vc/1"
-#: hwclock/kd.c:170
+#: hwclock/kd.c:171
msgid "KDGHWCLK ioctl failed"
msgstr "KDGHWCLK-ioctl misslyckades"
-#: hwclock/rtc.c:136
+#: hwclock/rtc.c:115 hwclock/rtc.c:208
+#, c-format
+msgid "open() of %s failed"
+msgstr "open() på %s misslyckades"
+
+#: hwclock/rtc.c:149
#, c-format
msgid "ioctl() to %s to read the time failed.\n"
msgstr "ioctl() till %s för att läsa tid misslyckades.\n"
-#: hwclock/rtc.c:158
+#: hwclock/rtc.c:171
#, c-format
msgid "Waiting in loop for time from %s to change\n"
msgstr "Väntar i slingan på att tiden från %s ska ändras\n"
-#: hwclock/rtc.c:195 hwclock/rtc.c:250
-#, c-format
-msgid "open() of %s failed"
-msgstr "open() på %s misslyckades"
-
-#: hwclock/rtc.c:213
+#: hwclock/rtc.c:226
#, c-format
msgid "%s does not have interrupt functions. "
msgstr "%s har inga avbrottsfunktioner. "
-#: hwclock/rtc.c:222
+#: hwclock/rtc.c:235
#, c-format
msgid "read() to %s to wait for clock tick failed"
msgstr "read() på %s för att vänta på klocktick misslyckades"
-#: hwclock/rtc.c:231
+#: hwclock/rtc.c:244
#, c-format
msgid "ioctl() to %s to turn off update interrupts failed"
msgstr "ioctl() på %s för att slå av uppdateringsavbrott misslyckades"
-#: hwclock/rtc.c:234
+#: hwclock/rtc.c:247
#, c-format
msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
msgstr "ioctl() på %s för att slå på uppdateringsavbrott misslyckades oväntat"
-#: hwclock/rtc.c:274 hwclock/rtc.c:358 hwclock/rtc.c:404
-#, c-format
-msgid "Unable to open %s"
-msgstr "Kan inte öppna %s"
-
-#: hwclock/rtc.c:300
+#: hwclock/rtc.c:306
#, c-format
msgid "ioctl() to %s to set the time failed.\n"
msgstr "ioctl() på %s för att ställa tiden misslyckades.\n"
-#: hwclock/rtc.c:306
+#: hwclock/rtc.c:312
#, c-format
msgid "ioctl(%s) was successful.\n"
msgstr "ioctl(%s) lyckades.\n"
-#: hwclock/rtc.c:335
+#: hwclock/rtc.c:341
#, c-format
msgid "Open of %s failed"
msgstr "Öppning av %s misslyckades"
-#: hwclock/rtc.c:353 hwclock/rtc.c:399
+#: hwclock/rtc.c:359 hwclock/rtc.c:405
#, c-format
msgid ""
"To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
@@ -5550,12 +5776,17 @@ msgstr ""
"För att ändra epokvärdet i kärnan måste vi komma åt Linux \"rtc\"-drivrutin "
"via specialenhetsfilen %s. Denna fil finns inte på detta system.\n"
-#: hwclock/rtc.c:365
+#: hwclock/rtc.c:364 hwclock/rtc.c:410
+#, c-format
+msgid "Unable to open %s"
+msgstr "Kan inte öppna %s"
+
+#: hwclock/rtc.c:371
#, c-format
msgid "ioctl(RTC_EPOCH_READ) to %s failed"
msgstr "ioctl(RTC_EPOCH_READ) på %s misslyckades"
-#: hwclock/rtc.c:371
+#: hwclock/rtc.c:377
#, c-format
msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
msgstr "vi har läst epoken %ld från %s med RTC_EPOCH_READ-ioctl.\n"
@@ -5563,57 +5794,27 @@ msgstr "vi har läst epoken %ld från %s med RTC_EPOCH_READ-ioctl.\n"
#. kernel would not accept this epoch value
#. Hmm - bad habit, deciding not to do what the user asks
#. just because one believes that the kernel might not like it.
-#: hwclock/rtc.c:391
+#: hwclock/rtc.c:397
#, c-format
msgid "The epoch value may not be less than 1900. You requested %ld\n"
msgstr "Epokvärdet får inte vara mindre än 1900. Du begärde %ld\n"
-#: hwclock/rtc.c:409
+#: hwclock/rtc.c:415
#, c-format
msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
msgstr "ställer epoken till %ld med RTC_EPOCH_SET-ioctl på %s.\n"
-#: hwclock/rtc.c:414
+#: hwclock/rtc.c:420
#, c-format
msgid ""
"The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
msgstr "Kärndrivrutinen för %s har inte RTC_EPOCH_SET-ioctl:en.\n"
-#: hwclock/rtc.c:417
+#: hwclock/rtc.c:423
#, c-format
msgid "ioctl(RTC_EPOCH_SET) to %s failed"
msgstr "ioctl(RTC_EPOCH_SET) på %s misslyckades"
-#: hwclock/shhopt.c:255 hwclock/shhopt.c:281
-#, c-format
-msgid "invalid number `%s'\n"
-msgstr "talet \"%s\" är inte giltigt\n"
-
-#: hwclock/shhopt.c:258 hwclock/shhopt.c:284
-#, c-format
-msgid "number `%s' to `%s' out of range\n"
-msgstr "tal \"%s\" till \"%s\" utanför intervallet\n"
-
-#: hwclock/shhopt.c:398
-#, c-format
-msgid "unrecognized option `%s'\n"
-msgstr "flaggan \"%s\" är okänd\n"
-
-#: hwclock/shhopt.c:411 hwclock/shhopt.c:449
-#, c-format
-msgid "option `%s' requires an argument\n"
-msgstr "flaggan \"%s\" kräver ett argument\n"
-
-#: hwclock/shhopt.c:417
-#, c-format
-msgid "option `%s' doesn't allow an argument\n"
-msgstr "flaggan \"%s\" tillåter inte ett argument\n"
-
-#: hwclock/shhopt.c:439
-#, c-format
-msgid "unrecognized option `-%c'\n"
-msgstr "flaggan \"-%c\" är okänd\n"
-
#: login-utils/agetty.c:312
msgid "calling open_tty\n"
msgstr "anropar open_tty\n"
@@ -6648,7 +6849,7 @@ msgstr "öppnande av katalog misslyckades\n"
msgid "fork failed\n"
msgstr "grening misslyckades\n"
-#: login-utils/simpleinit.c:512 text-utils/more.c:1705
+#: login-utils/simpleinit.c:512 text-utils/more.c:1706
msgid "exec failed\n"
msgstr "körning misslyckades\n"
@@ -7440,160 +7641,160 @@ msgstr "[mntent]: rad %d i %s är felaktig%s\n"
msgid "; rest of file ignored"
msgstr "; resten av filen ignoreras"
-#: mount/mount.c:379
+#: mount/mount.c:381
#, c-format
msgid "mount: according to mtab, %s is already mounted on %s"
msgstr "mount: enligt mtab är %s redan monterat på %s"
-#: mount/mount.c:383
+#: mount/mount.c:385
#, c-format
msgid "mount: according to mtab, %s is mounted on %s"
msgstr "mount: enligt mtab är %s monterat på %s"
-#: mount/mount.c:404
+#: mount/mount.c:406
#, c-format
msgid "mount: can't open %s for writing: %s"
msgstr "mount: kan inte öppna %s för skrivning: %s"
-#: mount/mount.c:419 mount/mount.c:638
+#: mount/mount.c:421 mount/mount.c:640
#, c-format
msgid "mount: error writing %s: %s"
msgstr "mount: fel vid skrivning av %s: %s"
-#: mount/mount.c:426
+#: mount/mount.c:428
#, c-format
msgid "mount: error changing mode of %s: %s"
msgstr "mount: fel vid byte av rättigheter på %s: %s"
-#: mount/mount.c:472
+#: mount/mount.c:474
#, c-format
msgid "%s looks like swapspace - not mounted"
msgstr "%s ser ut som växlingsutrymme - monteras inte"
-#: mount/mount.c:532
+#: mount/mount.c:534
msgid "mount failed"
msgstr "montering misslyckades"
-#: mount/mount.c:534
+#: mount/mount.c:536
#, c-format
msgid "mount: only root can mount %s on %s"
msgstr "mount: endast root kan montera %s på %s"
-#: mount/mount.c:562
+#: mount/mount.c:564
msgid "mount: loop device specified twice"
msgstr "mount: slingenheten angiven två gånger"
-#: mount/mount.c:567
+#: mount/mount.c:569
msgid "mount: type specified twice"
msgstr "mount: typen angiven två gånger"
-#: mount/mount.c:579
+#: mount/mount.c:581
msgid "mount: skipping the setup of a loop device\n"
msgstr "mount: hoppar över konfigurationen av en slingenhet\n"
-#: mount/mount.c:588
+#: mount/mount.c:590
#, c-format
msgid "mount: going to use the loop device %s\n"
msgstr "mount: kommer att använda slingenheten %s\n"
-#: mount/mount.c:592
+#: mount/mount.c:594
msgid "mount: failed setting up loop device\n"
msgstr "mount: misslyckades konfigurera slingenheten\n"
-#: mount/mount.c:596
+#: mount/mount.c:598
msgid "mount: setup loop device successfully\n"
msgstr "mount: lyckades konfigurera slingenheten\n"
-#: mount/mount.c:633
+#: mount/mount.c:635
#, c-format
msgid "mount: can't open %s: %s"
msgstr "mount: kan inte öppna %s: %s"
-#: mount/mount.c:656
+#: mount/mount.c:658
#, c-format
msgid "mount: cannot open %s for setting speed"
msgstr "mount: kan inte öppna %s för inställning av hastighet"
-#: mount/mount.c:659
+#: mount/mount.c:661
#, c-format
msgid "mount: cannot set speed: %s"
msgstr "mount: kan inte ställa in hastighet: %s"
-#: mount/mount.c:720 mount/mount.c:1265
+#: mount/mount.c:722 mount/mount.c:1295
#, c-format
msgid "mount: cannot fork: %s"
msgstr "mount: kan inte grena: %s"
-#: mount/mount.c:800
+#: mount/mount.c:802
msgid "mount: this version was compiled without support for the type `nfs'"
msgstr "mount: denna version kompilerades utan stöd för typen \"nfs\""
-#: mount/mount.c:839
+#: mount/mount.c:841
msgid "mount: failed with nfs mount version 4, trying 3..\n"
msgstr ""
"mount: misslyckades med montering av nfs version 4, försöker med 3...\n"
-#: mount/mount.c:850
+#: mount/mount.c:852
msgid ""
"mount: I could not determine the filesystem type, and none was specified"
msgstr "mount: Jag kunde inte avgöra filsystemstypen, och ingen angavs"
-#: mount/mount.c:853
+#: mount/mount.c:855
msgid "mount: you must specify the filesystem type"
msgstr "mount: du måste ange filsystemstypen"
#. should not happen
-#: mount/mount.c:856
+#: mount/mount.c:858
msgid "mount: mount failed"
msgstr "mount: montering misslyckades"
-#: mount/mount.c:862 mount/mount.c:897
+#: mount/mount.c:864 mount/mount.c:899
#, c-format
msgid "mount: mount point %s is not a directory"
msgstr "mount: monteringspunkten %s är inte en katalog"
-#: mount/mount.c:864
+#: mount/mount.c:866
msgid "mount: permission denied"
msgstr "mount: åtkomst nekas"
-#: mount/mount.c:866
+#: mount/mount.c:868
msgid "mount: must be superuser to use mount"
msgstr "mount: måste vara superanvändaren för att använda mount"
#. heuristic: if /proc/version exists, then probably proc is mounted
#. proc mounted?
-#: mount/mount.c:870 mount/mount.c:874
+#: mount/mount.c:872 mount/mount.c:876
#, c-format
msgid "mount: %s is busy"
msgstr "mount: %s är upptagen"
#. no
#. yes, don't mention it
-#: mount/mount.c:876
+#: mount/mount.c:878
msgid "mount: proc already mounted"
msgstr "mount: proc är redan monterad"
-#: mount/mount.c:878
+#: mount/mount.c:880
#, c-format
msgid "mount: %s already mounted or %s busy"
msgstr "mount: %s är redan monterad eller %s är upptagen"
-#: mount/mount.c:884
+#: mount/mount.c:886
#, c-format
msgid "mount: mount point %s does not exist"
msgstr "mount: monteringspunkten %s finns inte"
-#: mount/mount.c:886
+#: mount/mount.c:888
#, c-format
msgid "mount: mount point %s is a symbolic link to nowhere"
msgstr "mount: monteringspunkten %s är en symbolisk länk till ingenstans"
-#: mount/mount.c:889
+#: mount/mount.c:891
#, c-format
msgid "mount: special device %s does not exist"
msgstr "mount: specialenheten %s finns inte"
-#: mount/mount.c:899
+#: mount/mount.c:901
#, c-format
msgid ""
"mount: special device %s does not exist\n"
@@ -7602,12 +7803,12 @@ msgstr ""
"mount: specialenheten %s finns inte\n"
" (ett sökvägsprefix är inte en katalog)\n"
-#: mount/mount.c:912
+#: mount/mount.c:914
#, c-format
msgid "mount: %s not mounted already, or bad option"
msgstr "mount: %s är inte redan monterad, eller felaktig flagga"
-#: mount/mount.c:914
+#: mount/mount.c:916
#, c-format
msgid ""
"mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -7616,46 +7817,46 @@ msgstr ""
"mount: fel filsystemstyp, felaktig flagga, felaktigt superblock\n"
" på %s, eller för många monterade filsystem"
-#: mount/mount.c:948
+#: mount/mount.c:950
msgid "mount table full"
msgstr "monteringstabellen full"
-#: mount/mount.c:950
+#: mount/mount.c:952
#, c-format
msgid "mount: %s: can't read superblock"
msgstr "mount: %s: kan inte läsa superblock"
-#: mount/mount.c:954
+#: mount/mount.c:956
#, c-format
msgid "mount: %s: unknown device"
msgstr "mount: %s: okänd enhet"
-#: mount/mount.c:959
+#: mount/mount.c:961
#, c-format
msgid "mount: fs type %s not supported by kernel"
msgstr "mount: filsystemstypen %s stöds inte av kärnan"
-#: mount/mount.c:971
+#: mount/mount.c:973
#, c-format
msgid "mount: probably you meant %s"
msgstr "mount: du menade troligtvis %s"
-#: mount/mount.c:973
+#: mount/mount.c:975
msgid "mount: maybe you meant iso9660 ?"
msgstr "mount: du menade kanske iso9660?"
-#: mount/mount.c:976
+#: mount/mount.c:978
#, c-format
msgid "mount: %s has wrong device number or fs type %s not supported"
msgstr "mount: %s har fel enhetsnummer eller så stöds filsystemstypen %s inte"
#. strange ...
-#: mount/mount.c:982
+#: mount/mount.c:984
#, c-format
msgid "mount: %s is not a block device, and stat fails?"
msgstr "mount: %s är inte en blockenhet, och statustagning misslyckas?"
-#: mount/mount.c:984
+#: mount/mount.c:986
#, c-format
msgid ""
"mount: the kernel does not recognize %s as a block device\n"
@@ -7664,93 +7865,99 @@ msgstr ""
"mount: kärnan känner inte igen %s som en blockenhet\n"
" (kanske \"insmod drivrutin\"?)"
-#: mount/mount.c:987
+#: mount/mount.c:989
#, c-format
msgid "mount: %s is not a block device (maybe try `-o loop'?)"
msgstr "mount: %s är ingen blockenhet (försök kanske med \"-o loop\"?)"
-#: mount/mount.c:990
+#: mount/mount.c:992
#, c-format
msgid "mount: %s is not a block device"
msgstr "mount: %s är ingen blockenhet"
-#: mount/mount.c:993
+#: mount/mount.c:995
#, c-format
msgid "mount: %s is not a valid block device"
msgstr "mount: %s är ingen giltig blockenhet"
#. pre-linux 1.1.38, 1.1.41 and later
#. linux 1.1.38 and later
-#: mount/mount.c:996
+#: mount/mount.c:998
msgid "block device "
msgstr "blockenhet "
-#: mount/mount.c:998
+#: mount/mount.c:1000
#, c-format
msgid "mount: cannot mount %s%s read-only"
msgstr "mount: kan inte montera %s%s som endast läsbar"
-#: mount/mount.c:1002
+#: mount/mount.c:1004
#, c-format
msgid "mount: %s%s is write-protected but explicit `-w' flag given"
msgstr "mount: %s%s är skrivskyddad med en explicit \"-w\"-flagga angavs"
-#: mount/mount.c:1018
+#: mount/mount.c:1020
#, c-format
msgid "mount: %s%s is write-protected, mounting read-only"
msgstr "mount: %s%s är skrivskyddad, monterar som endast läsbar"
-#: mount/mount.c:1104
+#: mount/mount.c:1107
#, c-format
msgid "mount: the label %s occurs on both %s and %s\n"
msgstr "mount: etiketten %s förekommer både på %s och %s\n"
-#: mount/mount.c:1108
+#: mount/mount.c:1111
#, c-format
msgid "mount: %s duplicate - not mounted"
msgstr "mount: %s dubblerad - inte monterad"
-#: mount/mount.c:1118
+#: mount/mount.c:1121
#, c-format
msgid "mount: going to mount %s by %s\n"
msgstr "mount: kommer att montera %s med %s\n"
-#: mount/mount.c:1119
+#: mount/mount.c:1122
msgid "UUID"
msgstr "UUID"
-#: mount/mount.c:1119
+#: mount/mount.c:1122
msgid "label"
msgstr "etikett"
-#: mount/mount.c:1121 mount/mount.c:1521
+#: mount/mount.c:1124 mount/mount.c:1555
msgid "mount: no such partition found"
msgstr "mount: ingen sådan partition hittades"
-#: mount/mount.c:1129
+#: mount/mount.c:1132
msgid "mount: no type was given - I'll assume nfs because of the colon\n"
msgstr ""
"mount: ingen typ angavs - jag kommer att anta nfs på grund av kolonet\n"
+#: mount/mount.c:1137
+#, fuzzy
+msgid "mount: no type was given - I'll assume smb because of the // prefix\n"
+msgstr ""
+"mount: ingen typ angavs - jag kommer att anta nfs på grund av kolonet\n"
+
#.
#. * Retry in the background.
#.
-#: mount/mount.c:1145
+#: mount/mount.c:1153
#, c-format
msgid "mount: backgrounding \"%s\"\n"
msgstr "mount: förlägger \"%s\" till bakgrunden\n"
-#: mount/mount.c:1156
+#: mount/mount.c:1164
#, c-format
msgid "mount: giving up \"%s\"\n"
msgstr "mount: ger upp \"%s\"\n"
-#: mount/mount.c:1216
+#: mount/mount.c:1240
#, c-format
msgid "mount: %s already mounted on %s\n"
msgstr "mount: %s är redan monterad på %s\n"
-#: mount/mount.c:1335
+#: mount/mount.c:1369
msgid ""
"Usage: mount -V : print version\n"
" mount -h : print this help\n"
@@ -7796,40 +8003,40 @@ msgstr ""
"genom att använda -U uuid . Andra flaggor: [-nfFrsvw] [-o flaggor].\n"
"Säg man 8 mount för många fler detaljer.\n"
-#: mount/mount.c:1497
+#: mount/mount.c:1531
msgid "mount: only root can do that"
msgstr "mount: endast root kan göra det"
-#: mount/mount.c:1502
+#: mount/mount.c:1536
#, c-format
msgid "mount: no %s found - creating it..\n"
msgstr "mount: ingen %s hittades - skapar den...\n"
-#: mount/mount.c:1516
+#: mount/mount.c:1550
#, c-format
msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
msgstr "mount: etiketten %s förekommer på både %s och %s - inte monterad\n"
-#: mount/mount.c:1523
+#: mount/mount.c:1557
#, c-format
msgid "mount: mounting %s\n"
msgstr "mount: monterar %s\n"
-#: mount/mount.c:1532
+#: mount/mount.c:1566
msgid "nothing was mounted"
msgstr "ingenting monterades"
-#: mount/mount.c:1547
+#: mount/mount.c:1581
#, c-format
msgid "mount: cannot find %s in %s"
msgstr "mount: kan inte hitta %s i %s"
-#: mount/mount.c:1562
+#: mount/mount.c:1596
#, c-format
msgid "mount: can't find %s in %s or %s"
msgstr "mount: kan inte hitta %s i %s eller %s"
-#: mount/mount_by_label.c:169
+#: mount/mount_by_label.c:199
#, c-format
msgid ""
"mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
@@ -7837,34 +8044,34 @@ msgstr ""
"mount: kunde inte öppna %s, så UUID och ETIKETT-konvertering kan inte "
"utföras.\n"
-#: mount/mount_by_label.c:295
+#: mount/mount_by_label.c:325
msgid "mount: bad UUID"
msgstr "mount: felaktig UUID"
-#: mount/mount_guess_fstype.c:487
+#: mount/mount_guess_fstype.c:482
msgid "mount: error while guessing filesystem type\n"
msgstr "mount: fel vid gissning av filsystemstypen\n"
-#: mount/mount_guess_fstype.c:496
+#: mount/mount_guess_fstype.c:491
#, c-format
msgid "mount: you didn't specify a filesystem type for %s\n"
msgstr "mount: du angav ingen filsystemstyp för %s\n"
-#: mount/mount_guess_fstype.c:499
+#: mount/mount_guess_fstype.c:494
#, c-format
msgid " I will try all types mentioned in %s or %s\n"
msgstr " Jag kommer att försöka med alla typer nämnda i %s eller %s\n"
-#: mount/mount_guess_fstype.c:502
+#: mount/mount_guess_fstype.c:497
msgid " and it looks like this is swapspace\n"
msgstr " och det verkar som om detta är växlingsutrymme\n"
-#: mount/mount_guess_fstype.c:504
+#: mount/mount_guess_fstype.c:499
#, c-format
msgid " I will try type %s\n"
msgstr " Jag kommer att försöka med typen %s\n"
-#: mount/mount_guess_fstype.c:592
+#: mount/mount_guess_fstype.c:587
#, c-format
msgid "Trying %s\n"
msgstr "Försöker med %s\n"
@@ -7958,7 +8165,7 @@ msgstr "okänt nfs-statusreturvärde: %d"
msgid "bug in xstrndup call"
msgstr "programfel i xstrndup-anrop"
-#: mount/swapon.c:51
+#: mount/swapon.c:56
#, c-format
msgid ""
"usage: %s [-hV]\n"
@@ -7971,27 +8178,43 @@ msgstr ""
" %s [-v] [-p prioritet] special ...\n"
" %s [-s]\n"
-#: mount/swapon.c:88
+#: mount/swapon.c:66
+#, fuzzy, c-format
+msgid ""
+"usage: %s [-hV]\n"
+" %s -a [-v]\n"
+" %s [-v] special ...\n"
+msgstr ""
+"användning: %s [-hV]\n"
+" %s -a [-v]\n"
+" %s [-v] [-p prioritet] special ...\n"
+" %s [-s]\n"
+
+#: mount/swapon.c:170 mount/swapon.c:234
#, c-format
msgid "%s on %s\n"
msgstr "%s på %s\n"
-#: mount/swapon.c:93
+#: mount/swapon.c:174
#, c-format
msgid "swapon: cannot stat %s: %s\n"
msgstr "swapon: kan inte ta status på %s: %s\n"
-#: mount/swapon.c:105
+#: mount/swapon.c:185
#, c-format
msgid "swapon: warning: %s has insecure permissions %04o, %04o suggested\n"
msgstr "swapon: varning: %s har osäkra rättigheter %04o, föreslår %04o\n"
-#: mount/swapon.c:115
+#: mount/swapon.c:197
#, c-format
msgid "swapon: Skipping file %s - it appears to have holes.\n"
msgstr "swapon: Hoppar över filen %s - den verkar ha hål.\n"
-#: mount/swapon.c:222
+#: mount/swapon.c:240
+msgid "Not superuser.\n"
+msgstr ""
+
+#: mount/swapon.c:298 mount/swapon.c:386
#, c-format
msgid "%s: cannot open %s: %s\n"
msgstr "%s: kan inte öppna %s: %s\n"
@@ -8360,22 +8583,22 @@ msgstr "%s: %s (%s)\n"
msgid "%s: unknown argument: %s\n"
msgstr "%s: okänt argument: %s\n"
-#: sys-utils/ipcs.c:122
+#: sys-utils/ipcs.c:121
#, c-format
msgid "usage : %s -asmq -tclup \n"
msgstr "användning: %s -asmq -tclup\n"
-#: sys-utils/ipcs.c:123
+#: sys-utils/ipcs.c:122
#, c-format
msgid "\t%s [-s -m -q] -i id\n"
msgstr "\t%s [-s -m -q] -i id\n"
-#: sys-utils/ipcs.c:124
+#: sys-utils/ipcs.c:123
#, c-format
msgid "\t%s -h for help.\n"
msgstr "\t%s -h för hjälp.\n"
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:129
#, c-format
msgid ""
"%s provides information on ipc facilities for which you have read access.\n"
@@ -8383,7 +8606,7 @@ msgstr ""
"%s tillhandahåller information om ipc-faciliteter för vilka du har\n"
"läsrättighet.\n"
-#: sys-utils/ipcs.c:132
+#: sys-utils/ipcs.c:131
msgid ""
"Resource Specification:\n"
"\t-m : shared_mem\n"
@@ -8393,7 +8616,7 @@ msgstr ""
"\t-m : delat minne\n"
"\t-q : meddelanden\n"
-#: sys-utils/ipcs.c:133
+#: sys-utils/ipcs.c:132
msgid ""
"\t-s : semaphores\n"
"\t-a : all (default)\n"
@@ -8401,7 +8624,7 @@ msgstr ""
"\t-s : semaforer\n"
"\t-a : alla (standard)\n"
-#: sys-utils/ipcs.c:134
+#: sys-utils/ipcs.c:133
msgid ""
"Output Format:\n"
"\t-t : time\n"
@@ -8413,7 +8636,7 @@ msgstr ""
"\t-p : pid\n"
"\t-c : skapare\n"
-#: sys-utils/ipcs.c:135
+#: sys-utils/ipcs.c:134
msgid ""
"\t-l : limits\n"
"\t-u : summary\n"
@@ -8421,377 +8644,377 @@ msgstr ""
"\t-l : gränser\n"
"\t-u : sammanfattning\n"
-#: sys-utils/ipcs.c:136
+#: sys-utils/ipcs.c:135
msgid "-i id [-s -q -m] : details on resource identified by id\n"
msgstr "-i id [-s -q -m] : detaljer om resursen som identifieras av id\n"
-#: sys-utils/ipcs.c:268
+#: sys-utils/ipcs.c:267
msgid "kernel not configured for shared memory\n"
msgstr "kärnan är inte konfigurerad för delat minne\n"
-#: sys-utils/ipcs.c:274
+#: sys-utils/ipcs.c:273
msgid "------ Shared Memory Limits --------\n"
msgstr "------ Gränser för delat minne --------\n"
#. glibc 2.1.3 and all earlier libc's have ints as fields
#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
-#: sys-utils/ipcs.c:279
+#: sys-utils/ipcs.c:278
#, c-format
msgid "max number of segments = %ld\n"
msgstr "maximalt antal segment = %ld\n"
-#: sys-utils/ipcs.c:281
+#: sys-utils/ipcs.c:280
#, c-format
msgid "max seg size (kbytes) = %ld\n"
msgstr "maximal segmentstorlek (kilobyte) = %ld\n"
-#: sys-utils/ipcs.c:283
+#: sys-utils/ipcs.c:282
#, c-format
msgid "max total shared memory (kbytes) = %ld\n"
msgstr "maximalt totalt delat minne (kilobyte) = %ld\n"
-#: sys-utils/ipcs.c:285
+#: sys-utils/ipcs.c:284
#, c-format
msgid "min seg size (bytes) = %ld\n"
msgstr "minimal segmentstorlek (byte) = %ld\n"
-#: sys-utils/ipcs.c:290
+#: sys-utils/ipcs.c:289
msgid "------ Shared Memory Status --------\n"
msgstr "------ Status för delat minne --------\n"
-#: sys-utils/ipcs.c:291
+#: sys-utils/ipcs.c:290
#, c-format
msgid "segments allocated %d\n"
msgstr "allokerade segment %d\n"
-#: sys-utils/ipcs.c:292
+#: sys-utils/ipcs.c:291
#, c-format
msgid "pages allocated %ld\n"
msgstr "allokerade sidor %ld\n"
-#: sys-utils/ipcs.c:293
+#: sys-utils/ipcs.c:292
#, c-format
msgid "pages resident %ld\n"
msgstr "residenta sidor %ld\n"
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:293
#, c-format
msgid "pages swapped %ld\n"
msgstr "utväxlade sidor %ld\n"
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:294
#, c-format
msgid "Swap performance: %ld attempts\t %ld successes\n"
msgstr "Växlingsprestanda: %ld försök\t %ld lyckade försök\n"
-#: sys-utils/ipcs.c:300
+#: sys-utils/ipcs.c:299
msgid "------ Shared Memory Segment Creators/Owners --------\n"
msgstr "------ Skapare/Ägare av delade minnessegment --------\n"
-#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:300 sys-utils/ipcs.c:417 sys-utils/ipcs.c:516
#, c-format
msgid "%-10s %-10s %-10s %-10s %-10s %-10s\n"
msgstr "%-10s %-10s %-10s %-10s %-10s %-10s\n"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:308 sys-utils/ipcs.c:315
-#: sys-utils/ipcs.c:321 sys-utils/ipcs.c:425
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:307 sys-utils/ipcs.c:314
+#: sys-utils/ipcs.c:320 sys-utils/ipcs.c:424
msgid "shmid"
msgstr "shmid"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:321 sys-utils/ipcs.c:419
-#: sys-utils/ipcs.c:434 sys-utils/ipcs.c:519 sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:320 sys-utils/ipcs.c:418
+#: sys-utils/ipcs.c:433 sys-utils/ipcs.c:517 sys-utils/ipcs.c:535
msgid "perms"
msgstr "rättigh"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:517
msgid "cuid"
msgstr "vuid"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:517
msgid "cgid"
msgstr "cgid"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:517
msgid "uid"
msgstr "uid"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:517
msgid "gid"
msgstr "gid"
-#: sys-utils/ipcs.c:306
+#: sys-utils/ipcs.c:305
msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
msgstr "------ Tilläggs-/Lösgörnings-/Ändringstider för delat minne --------\n"
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:306
#, c-format
msgid "%-10s %-10s %-20s %-20s %-20s\n"
msgstr "%-10s %-10s %-20s %-20s %-20s\n"
-#: sys-utils/ipcs.c:308 sys-utils/ipcs.c:315 sys-utils/ipcs.c:321
-#: sys-utils/ipcs.c:425 sys-utils/ipcs.c:434 sys-utils/ipcs.c:525
-#: sys-utils/ipcs.c:531 sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:314 sys-utils/ipcs.c:320
+#: sys-utils/ipcs.c:424 sys-utils/ipcs.c:433 sys-utils/ipcs.c:523
+#: sys-utils/ipcs.c:529 sys-utils/ipcs.c:535
msgid "owner"
msgstr "ägare"
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:307
msgid "attached"
msgstr "tillagd"
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:307
msgid "detached"
msgstr "lösgjord"
-#: sys-utils/ipcs.c:309
+#: sys-utils/ipcs.c:308
msgid "changed"
msgstr "ändrad"
-#: sys-utils/ipcs.c:313
+#: sys-utils/ipcs.c:312
msgid "------ Shared Memory Creator/Last-op --------\n"
msgstr "------ Skapare/Senaste operation på delat minne --------\n"
-#: sys-utils/ipcs.c:314 sys-utils/ipcs.c:530
+#: sys-utils/ipcs.c:313 sys-utils/ipcs.c:528
#, c-format
msgid "%-10s %-10s %-10s %-10s\n"
msgstr "%-10s %-10s %-10s %-10s\n"
-#: sys-utils/ipcs.c:315
+#: sys-utils/ipcs.c:314
msgid "cpid"
msgstr "cpid"
-#: sys-utils/ipcs.c:315
+#: sys-utils/ipcs.c:314
msgid "lpid"
msgstr "lpid"
-#: sys-utils/ipcs.c:319
+#: sys-utils/ipcs.c:318
msgid "------ Shared Memory Segments --------\n"
msgstr "------ Delade minnessegment --------\n"
-#: sys-utils/ipcs.c:320
+#: sys-utils/ipcs.c:319
#, c-format
msgid "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n"
msgstr "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n"
-#: sys-utils/ipcs.c:321 sys-utils/ipcs.c:434 sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:320 sys-utils/ipcs.c:433 sys-utils/ipcs.c:535
msgid "key"
msgstr "nyckel"
-#: sys-utils/ipcs.c:321
+#: sys-utils/ipcs.c:320
msgid "bytes"
msgstr "byte"
-#: sys-utils/ipcs.c:322
+#: sys-utils/ipcs.c:321
msgid "nattch"
msgstr "anttill"
-#: sys-utils/ipcs.c:322 sys-utils/ipcs.c:435
+#: sys-utils/ipcs.c:321
msgid "status"
msgstr "status"
-#: sys-utils/ipcs.c:343 sys-utils/ipcs.c:345 sys-utils/ipcs.c:347
-#: sys-utils/ipcs.c:456 sys-utils/ipcs.c:458 sys-utils/ipcs.c:558
-#: sys-utils/ipcs.c:560 sys-utils/ipcs.c:562 sys-utils/ipcs.c:615
-#: sys-utils/ipcs.c:617 sys-utils/ipcs.c:646 sys-utils/ipcs.c:648
-#: sys-utils/ipcs.c:650 sys-utils/ipcs.c:674
+#: sys-utils/ipcs.c:342 sys-utils/ipcs.c:344 sys-utils/ipcs.c:346
+#: sys-utils/ipcs.c:455 sys-utils/ipcs.c:457 sys-utils/ipcs.c:556
+#: sys-utils/ipcs.c:558 sys-utils/ipcs.c:560 sys-utils/ipcs.c:613
+#: sys-utils/ipcs.c:615 sys-utils/ipcs.c:644 sys-utils/ipcs.c:646
+#: sys-utils/ipcs.c:648 sys-utils/ipcs.c:672
msgid "Not set"
msgstr "Inte inställd"
-#: sys-utils/ipcs.c:372
+#: sys-utils/ipcs.c:371
msgid "dest"
msgstr "mål"
-#: sys-utils/ipcs.c:373
+#: sys-utils/ipcs.c:372
msgid "locked"
msgstr "låst"
-#: sys-utils/ipcs.c:393
+#: sys-utils/ipcs.c:392
msgid "kernel not configured for semaphores\n"
msgstr "kärnan är inte konfigurerad för semaforer\n"
-#: sys-utils/ipcs.c:399
+#: sys-utils/ipcs.c:398
msgid "------ Semaphore Limits --------\n"
msgstr "------ Semaforgränser --------\n"
-#: sys-utils/ipcs.c:403
+#: sys-utils/ipcs.c:402
#, c-format
msgid "max number of arrays = %d\n"
msgstr "maximalt antal vektorer = %d\n"
-#: sys-utils/ipcs.c:404
+#: sys-utils/ipcs.c:403
#, c-format
msgid "max semaphores per array = %d\n"
msgstr "maximalt antal semaforer per vektor = %d\n"
-#: sys-utils/ipcs.c:405
+#: sys-utils/ipcs.c:404
#, c-format
msgid "max semaphores system wide = %d\n"
msgstr "maximalt antal semaforer på systemet = %d\n"
-#: sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:405
#, c-format
msgid "max ops per semop call = %d\n"
msgstr "maximalt antal operationer per semaforopsanrop = %d\n"
-#: sys-utils/ipcs.c:407
+#: sys-utils/ipcs.c:406
#, c-format
msgid "semaphore max value = %d\n"
msgstr "maxvärde på semafor = %d\n"
-#: sys-utils/ipcs.c:411
+#: sys-utils/ipcs.c:410
msgid "------ Semaphore Status --------\n"
msgstr "------ Semaforstatus --------\n"
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:411
#, c-format
msgid "used arrays = %d\n"
msgstr "använda vektorer = %d\n"
-#: sys-utils/ipcs.c:413
+#: sys-utils/ipcs.c:412
#, c-format
msgid "allocated semaphores = %d\n"
msgstr "allokerade semaforer = %d\n"
-#: sys-utils/ipcs.c:417
+#: sys-utils/ipcs.c:416
msgid "------ Semaphore Arrays Creators/Owners --------\n"
msgstr "------ Skapare/Ägare av semaforvektorer --------\n"
-#: sys-utils/ipcs.c:419 sys-utils/ipcs.c:434
+#: sys-utils/ipcs.c:418 sys-utils/ipcs.c:433
msgid "semid"
msgstr "semid"
-#: sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:422
msgid "------ Shared Memory Operation/Change Times --------\n"
msgstr "------ Tider för operationer på/ändringar av delat minne --------\n"
-#: sys-utils/ipcs.c:424
+#: sys-utils/ipcs.c:423
#, c-format
msgid "%-8s %-10s %-26.24s %-26.24s\n"
msgstr "%-8s %-10s %-26.24s %-26.24s\n"
-#: sys-utils/ipcs.c:425
+#: sys-utils/ipcs.c:424
msgid "last-op"
msgstr "senaste-op"
-#: sys-utils/ipcs.c:425
+#: sys-utils/ipcs.c:424
msgid "last-changed"
msgstr "senast-ändrad"
-#: sys-utils/ipcs.c:432
+#: sys-utils/ipcs.c:431
msgid "------ Semaphore Arrays --------\n"
msgstr "------ Semaforvektorer --------\n"
-#: sys-utils/ipcs.c:433
+#: sys-utils/ipcs.c:432 sys-utils/ipcs.c:675
#, c-format
-msgid "%-10s %-10s %-10s %-10s %-10s %-12s\n"
-msgstr "%-10s %-10s %-10s %-10s %-10s %-12s\n"
+msgid "%-10s %-10s %-10s %-10s %-10s\n"
+msgstr "%-10s %-10s %-10s %-10s %-10s\n"
-#: sys-utils/ipcs.c:435
+#: sys-utils/ipcs.c:434
msgid "nsems"
msgstr "antsem"
-#: sys-utils/ipcs.c:495
+#: sys-utils/ipcs.c:493
msgid "kernel not configured for message queues\n"
msgstr "kärnan är inte konfigurerad för meddelandeköer\n"
-#: sys-utils/ipcs.c:503
+#: sys-utils/ipcs.c:501
msgid "------ Messages: Limits --------\n"
msgstr "------ Meddelanden: Gränser --------\n"
-#: sys-utils/ipcs.c:504
+#: sys-utils/ipcs.c:502
#, c-format
msgid "max queues system wide = %d\n"
msgstr "maximalt antal köer på hela systemet = %d\n"
-#: sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:503
#, c-format
msgid "max size of message (bytes) = %d\n"
msgstr "maximal storlek på meddelande (byte) = %d\n"
-#: sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:504
#, c-format
msgid "default max size of queue (bytes) = %d\n"
msgstr "standardmaxstorlek på kö (byte) = %d\n"
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:508
msgid "------ Messages: Status --------\n"
msgstr "------ Meddelande: Status --------\n"
-#: sys-utils/ipcs.c:511
+#: sys-utils/ipcs.c:509
#, c-format
msgid "allocated queues = %d\n"
msgstr "allokerade köer = %d\n"
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:510
#, c-format
msgid "used headers = %d\n"
msgstr "använda huvuden = %d\n"
-#: sys-utils/ipcs.c:513
+#: sys-utils/ipcs.c:511
#, c-format
msgid "used space = %d bytes\n"
msgstr "använt utrymme = %d byte\n"
-#: sys-utils/ipcs.c:517
+#: sys-utils/ipcs.c:515
msgid "------ Message Queues: Creators/Owners --------\n"
msgstr "------ Meddelandeköer: Skapare/Ägare --------\n"
-#: sys-utils/ipcs.c:519 sys-utils/ipcs.c:525 sys-utils/ipcs.c:531
-#: sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:517 sys-utils/ipcs.c:523 sys-utils/ipcs.c:529
+#: sys-utils/ipcs.c:535
msgid "msqid"
msgstr "meddköid"
-#: sys-utils/ipcs.c:523
+#: sys-utils/ipcs.c:521
msgid "------ Message Queues Send/Recv/Change Times --------\n"
msgstr ""
"------ Meddelandeköernas sändnings-/mottagnings-/ändringstider --------\n"
-#: sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:522
#, c-format
msgid "%-8s %-10s %-20s %-20s %-20s\n"
msgstr "%-8s %-10s %-20s %-20s %-20s\n"
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:523
msgid "send"
msgstr "sänt"
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:523
msgid "recv"
msgstr "mottaget"
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:523
msgid "change"
msgstr "ändring"
-#: sys-utils/ipcs.c:529
+#: sys-utils/ipcs.c:527
msgid "------ Message Queues PIDs --------\n"
msgstr "------ PID för meddelandeköer --------\n"
-#: sys-utils/ipcs.c:531
+#: sys-utils/ipcs.c:529
msgid "lspid"
msgstr "lspid"
-#: sys-utils/ipcs.c:531
+#: sys-utils/ipcs.c:529
msgid "lrpid"
msgstr "lrpid"
-#: sys-utils/ipcs.c:535
+#: sys-utils/ipcs.c:533
msgid "------ Message Queues --------\n"
msgstr "------ Meddelandeköer --------\n"
-#: sys-utils/ipcs.c:536
+#: sys-utils/ipcs.c:534
#, c-format
msgid "%-10s %-10s %-10s %-10s %-12s %-12s\n"
msgstr "%-10s %-10s %-10s %-10s %-12s %-12s\n"
-#: sys-utils/ipcs.c:538
+#: sys-utils/ipcs.c:536
msgid "used-bytes"
msgstr "använda-byte"
-#: sys-utils/ipcs.c:538
+#: sys-utils/ipcs.c:536
msgid "messages"
msgstr "meddelanden"
-#: sys-utils/ipcs.c:606
+#: sys-utils/ipcs.c:604
#, c-format
msgid ""
"\n"
@@ -8800,37 +9023,37 @@ msgstr ""
"\n"
"Delat minnessegment shmid=%d\n"
-#: sys-utils/ipcs.c:607
+#: sys-utils/ipcs.c:605
#, c-format
msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
-#: sys-utils/ipcs.c:609
+#: sys-utils/ipcs.c:607
#, c-format
msgid "mode=%#o\taccess_perms=%#o\n"
msgstr "rättighet=%#o\tåtkomsträttigheter=%#o\n"
-#: sys-utils/ipcs.c:611
+#: sys-utils/ipcs.c:609
#, c-format
msgid "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n"
msgstr "byte=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n"
-#: sys-utils/ipcs.c:614
+#: sys-utils/ipcs.c:612
#, c-format
msgid "att_time=%-26.24s\n"
msgstr "attid=%-26.24s\n"
-#: sys-utils/ipcs.c:616
+#: sys-utils/ipcs.c:614
#, c-format
msgid "det_time=%-26.24s\n"
msgstr "dettid=%-26.24s\n"
-#: sys-utils/ipcs.c:618 sys-utils/ipcs.c:649
+#: sys-utils/ipcs.c:616 sys-utils/ipcs.c:647
#, c-format
msgid "change_time=%-26.24s\n"
msgstr "ändringstid=%-26.24s\n"
-#: sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:631
#, c-format
msgid ""
"\n"
@@ -8839,27 +9062,27 @@ msgstr ""
"\n"
"Meddelandekö meddköid=%d\n"
-#: sys-utils/ipcs.c:634
+#: sys-utils/ipcs.c:632
#, c-format
msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\trättighet=%#o\n"
-#: sys-utils/ipcs.c:636
+#: sys-utils/ipcs.c:634
#, c-format
msgid "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
msgstr "cbyte=%ld\tqbyte=%ld\tkönum=%ld\tlspid=%d\tlrpid=%d\n"
-#: sys-utils/ipcs.c:645
+#: sys-utils/ipcs.c:643
#, c-format
msgid "send_time=%-26.24s\n"
msgstr "sändningstid=%-26.24s\n"
-#: sys-utils/ipcs.c:647
+#: sys-utils/ipcs.c:645
#, c-format
msgid "rcv_time=%-26.24s\n"
msgstr "mottagningstid=%-26.24s\n"
-#: sys-utils/ipcs.c:667
+#: sys-utils/ipcs.c:665
#, c-format
msgid ""
"\n"
@@ -8868,53 +9091,48 @@ msgstr ""
"\n"
"Semaforvektor semid=%d\n"
-#: sys-utils/ipcs.c:668
+#: sys-utils/ipcs.c:666
#, c-format
msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
msgstr "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
-#: sys-utils/ipcs.c:670
+#: sys-utils/ipcs.c:668
#, c-format
msgid "mode=%#o, access_perms=%#o\n"
msgstr "rättighet=%#o, åtkomsträttigheter=%#o\n"
-#: sys-utils/ipcs.c:672
+#: sys-utils/ipcs.c:670
#, c-format
msgid "nsems = %ld\n"
msgstr "antsem = %ld\n"
-#: sys-utils/ipcs.c:673
+#: sys-utils/ipcs.c:671
#, c-format
msgid "otime = %-26.24s\n"
msgstr "otid = %-26.24s\n"
-#: sys-utils/ipcs.c:675
+#: sys-utils/ipcs.c:673
#, c-format
msgid "ctime = %-26.24s\n"
msgstr "ctid = %-26.24s\n"
-#: sys-utils/ipcs.c:677
-#, c-format
-msgid "%-10s %-10s %-10s %-10s %-10s\n"
-msgstr "%-10s %-10s %-10s %-10s %-10s\n"
-
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "semnum"
msgstr "semnum"
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "value"
msgstr "värde"
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "ncount"
msgstr "nräkn"
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "zcount"
msgstr "zräkn"
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "pid"
msgstr "pid"
@@ -9167,11 +9385,11 @@ msgstr "-- raden redan spolad"
msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
msgstr "användning: %s [ - ] [ -2 ] [ fil ... ]\n"
-#: text-utils/column.c:298
+#: text-utils/column.c:297
msgid "line too long"
msgstr "raden är för lång"
-#: text-utils/column.c:375
+#: text-utils/column.c:374
msgid "usage: column [-tx] [-c columns] [file ...]\n"
msgstr "användning: column [-tx] [-c kolumner] [fil ...]\n"
@@ -9262,33 +9480,33 @@ msgstr ""
msgid "Can't open help file"
msgstr "Kan inte öppna hjälpfil"
-#: text-utils/more.c:1442 text-utils/more.c:1446
+#: text-utils/more.c:1442 text-utils/more.c:1447
msgid "[Press 'h' for instructions.]"
msgstr "[Tryck \"h\" för instruktioner.]"
-#: text-utils/more.c:1480
+#: text-utils/more.c:1481
#, c-format
msgid "\"%s\" line %d"
msgstr "\"%s\" rad %d"
-#: text-utils/more.c:1482
+#: text-utils/more.c:1483
#, c-format
msgid "[Not a file] line %d"
msgstr "[Inte en fil] rad %d"
-#: text-utils/more.c:1566
+#: text-utils/more.c:1567
msgid " Overflow\n"
msgstr " Spill\n"
-#: text-utils/more.c:1613
+#: text-utils/more.c:1614
msgid "...skipping\n"
msgstr "...hoppar över\n"
-#: text-utils/more.c:1643
+#: text-utils/more.c:1644
msgid "Regular expression botch"
msgstr "Reguljärt uttrycksmischmasch"
-#: text-utils/more.c:1655
+#: text-utils/more.c:1656
msgid ""
"\n"
"Pattern not found\n"
@@ -9296,15 +9514,15 @@ msgstr ""
"\n"
"Mönstret hittades inte\n"
-#: text-utils/more.c:1658
+#: text-utils/more.c:1659 text-utils/pg.c:1134 text-utils/pg.c:1285
msgid "Pattern not found"
msgstr "Mönstret hittades inte"
-#: text-utils/more.c:1719
+#: text-utils/more.c:1720
msgid "can't fork\n"
msgstr "kan inte grena\n"
-#: text-utils/more.c:1758
+#: text-utils/more.c:1759
msgid ""
"\n"
"...Skipping "
@@ -9312,19 +9530,19 @@ msgstr ""
"\n"
"...Hoppar över "
-#: text-utils/more.c:1763
+#: text-utils/more.c:1764
msgid "...Skipping to file "
msgstr "...Hoppar över till filen "
-#: text-utils/more.c:1765
+#: text-utils/more.c:1766
msgid "...Skipping back to file "
msgstr "...Hoppar tillbaka till filen "
-#: text-utils/more.c:2046
+#: text-utils/more.c:2047
msgid "Line too long"
msgstr "Raden är för lång"
-#: text-utils/more.c:2089
+#: text-utils/more.c:2090
msgid "No previous command to substitute for"
msgstr "Inget tidigare kommando att ersätta"
@@ -9374,6 +9592,102 @@ msgstr "hexdump: felaktigt format {%s}\n"
msgid "hexdump: bad conversion character %%%s.\n"
msgstr "hexdump: felaktigt konverteringstecken %%%s.\n"
+#: text-utils/pg.c:246
+#, c-format
+msgid ""
+"%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
+msgstr ""
+
+#: text-utils/pg.c:255
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- %s\n"
+msgstr "flaggan \"%s\" kräver ett argument\n"
+
+#: text-utils/pg.c:263
+#, fuzzy, c-format
+msgid "%s: illegal option -- %s\n"
+msgstr "%s: otillåten flagga -- %c\n"
+
+#: text-utils/pg.c:380
+#, fuzzy
+msgid "...skipping forward\n"
+msgstr "...hoppar över\n"
+
+#: text-utils/pg.c:382
+#, fuzzy
+msgid "...skipping backward\n"
+msgstr "...hoppar över\n"
+
+#: text-utils/pg.c:404
+#, fuzzy
+msgid "No next file"
+msgstr "(Nästa fil: %s)"
+
+#: text-utils/pg.c:408
+#, fuzzy
+msgid "No previous file"
+msgstr "Inga partitioner är angivna\n"
+
+#: text-utils/pg.c:938
+#, fuzzy, c-format
+msgid "%s: Read error from %s file\n"
+msgstr "%s: läsfel på %s\n"
+
+#.
+#. * Most likely '\0' in input.
+#.
+#: text-utils/pg.c:944
+#, c-format
+msgid "%s: Unexpected EOF in %s file\n"
+msgstr ""
+
+#: text-utils/pg.c:947
+#, fuzzy, c-format
+msgid "%s: Unknown error in %s file\n"
+msgstr "okänt fel i id"
+
+#: text-utils/pg.c:1042
+#, fuzzy, c-format
+msgid "%s: Cannot create tempfile\n"
+msgstr "%s: kan inte läsa temporär fil.\n"
+
+#: text-utils/pg.c:1051 text-utils/pg.c:1226
+#, fuzzy
+msgid "RE error: "
+msgstr ", fel"
+
+#: text-utils/pg.c:1208
+msgid "(EOF)"
+msgstr ""
+
+#: text-utils/pg.c:1234
+msgid "No remembered search string"
+msgstr ""
+
+#: text-utils/pg.c:1317
+#, fuzzy
+msgid "Cannot open "
+msgstr "Kan inte öppna %s\n"
+
+#: text-utils/pg.c:1365
+#, fuzzy
+msgid "saved"
+msgstr "sänt"
+
+#: text-utils/pg.c:1472
+msgid ": !command not allowed in rflag mode.\n"
+msgstr ""
+
+#: text-utils/pg.c:1504
+#, fuzzy
+msgid "fork() failed, try again later\n"
+msgstr "Lösenordet ändrades *INTE*. Försök igen senare.\n"
+
+#: text-utils/pg.c:1709
+#, fuzzy
+msgid "(Next file: "
+msgstr "(Nästa fil: %s)"
+
#: text-utils/rev.c:113
msgid "Unable to allocate bufferspace\n"
msgstr "Kan inte allokera buffertutrymme\n"
@@ -9408,6 +9722,27 @@ msgstr "Indataraden är för lång.\n"
msgid "Out of memory when growing buffer.\n"
msgstr "Slut på minne vid växande av buffert.\n"
+#~ msgid "invalid number `%s'\n"
+#~ msgstr "talet \"%s\" är inte giltigt\n"
+
+#~ msgid "number `%s' to `%s' out of range\n"
+#~ msgstr "tal \"%s\" till \"%s\" utanför intervallet\n"
+
+#~ msgid "unrecognized option `%s'\n"
+#~ msgstr "flaggan \"%s\" är okänd\n"
+
+#~ msgid "option `%s' requires an argument\n"
+#~ msgstr "flaggan \"%s\" kräver ett argument\n"
+
+#~ msgid "option `%s' doesn't allow an argument\n"
+#~ msgstr "flaggan \"%s\" tillåter inte ett argument\n"
+
+#~ msgid "unrecognized option `-%c'\n"
+#~ msgstr "flaggan \"-%c\" är okänd\n"
+
+#~ msgid "%-10s %-10s %-10s %-10s %-10s %-12s\n"
+#~ msgstr "%-10s %-10s %-10s %-10s %-10s %-12s\n"
+
#~ msgid "umount: only %s can unmount %s from %s"
#~ msgstr "umount: endast %s kan avmontera %s från %s"
diff --git a/po/tr.po b/po/tr.po
index 26cd025bf..2f90a7873 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -9,9 +9,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: util-linux 2.11q\n"
-"POT-Creation-Date: 2002-05-09 02:51+0200\n"
-"PO-Revision-Date: 2002-04-11 14:29+0300\n"
+"Project-Id-Version: util-linux 2.11r\n"
+"POT-Creation-Date: 2002-07-07 17:03+0200\n"
+"PO-Revision-Date: 2002-06-26 15:29+0300\n"
"Last-Translator: Nilgün Belma Bugüner <nilgun@fide.org>\n"
"Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
@@ -114,28 +114,28 @@ msgstr "RO RA Sboyu Bboyu BaşlSkt Boyut Aygıt\n"
msgid "usage:\n"
msgstr "kullanımı:\n"
-#: disk-utils/fdformat.c:35
+#: disk-utils/fdformat.c:31
msgid "Formatting ... "
msgstr "Biçemlendiriliyor..."
-#: disk-utils/fdformat.c:53 disk-utils/fdformat.c:88
+#: disk-utils/fdformat.c:49 disk-utils/fdformat.c:84
msgid "done\n"
msgstr "tamam\n"
-#: disk-utils/fdformat.c:64
+#: disk-utils/fdformat.c:60
msgid "Verifying ... "
msgstr "Doğrulanıyor..."
-#: disk-utils/fdformat.c:75
+#: disk-utils/fdformat.c:71
msgid "Read: "
msgstr "Okunan: "
-#: disk-utils/fdformat.c:77
+#: disk-utils/fdformat.c:73
#, c-format
msgid "Problem reading cylinder %d, expected %d, read %d\n"
msgstr "%d silindiri okunurken sorun çıktı, %d gerekirken %d okundu\n"
-#: disk-utils/fdformat.c:83
+#: disk-utils/fdformat.c:79
#, c-format
msgid ""
"bad data in cyl %d\n"
@@ -144,42 +144,148 @@ msgstr ""
"%d silindirinde veri hatalı\n"
"Devam ediliyor..."
-#: disk-utils/fdformat.c:98
+#: disk-utils/fdformat.c:94
#, c-format
msgid "usage: %s [ -n ] device\n"
msgstr "kullanımı: %s [ -n ] AYGIT\n"
-#: disk-utils/fdformat.c:120 disk-utils/fsck.minix.c:1291
+#: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1291
#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:55
-#: disk-utils/mkfs.minix.c:644 disk-utils/mkswap.c:457
-#: disk-utils/setfdprm.c:128 misc-utils/cal.c:246 misc-utils/ddate.c:181
-#: misc-utils/kill.c:188 misc-utils/rename.c:79 misc-utils/script.c:132
+#: disk-utils/mkfs.cramfs.c:665 disk-utils/mkfs.minix.c:644
+#: disk-utils/mkswap.c:457 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1170
+#: misc-utils/cal.c:246 misc-utils/ddate.c:181 misc-utils/kill.c:188
+#: misc-utils/rename.c:79 misc-utils/script.c:132
#, c-format
msgid "%s from %s\n"
msgstr "%s (%s den)\n"
-#: disk-utils/fdformat.c:134
-#, c-format
-msgid "%s: not a floppy device\n"
+#: disk-utils/fdformat.c:130
+#, fuzzy, c-format
+msgid "%s: not a block device\n"
msgstr "%s: bir disket aygıtı değil\n"
-#: disk-utils/fdformat.c:143
+#: disk-utils/fdformat.c:140
msgid "Could not determine current format type"
msgstr "mevcut biçem türü saptanamadı"
-#: disk-utils/fdformat.c:144
+#: disk-utils/fdformat.c:141
#, c-format
msgid "%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n"
msgstr "%s-yüzlü, %d iz, %d sektör/iz. Toplam %d kB.\n"
-#: disk-utils/fdformat.c:145
+#: disk-utils/fdformat.c:142
msgid "Double"
msgstr "Çift"
-#: disk-utils/fdformat.c:145
+#: disk-utils/fdformat.c:142
msgid "Single"
msgstr "Tek"
+#: disk-utils/fsck.cramfs.c:98
+#, c-format
+msgid ""
+"usage: %s [-hv] [-x dir] file\n"
+" -h print this help\n"
+" -x dir extract into dir\n"
+" -v be more verbose\n"
+" file file to test\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:191
+#, c-format
+msgid "%s: error %d while decompressing! %p(%d)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:243
+#, fuzzy, c-format
+msgid "%s: size error in symlink `%s'\n"
+msgstr "%s: %s üzerinde erişim hatası\n"
+
+#: disk-utils/fsck.cramfs.c:258 disk-utils/fsck.cramfs.c:328
+#, c-format
+msgid " uncompressing block at %ld to %ld (%ld)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:287
+#, c-format
+msgid "%s: bogus mode on `%s' (%o)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:319
+#, fuzzy, c-format
+msgid " hole at %ld (%d)\n"
+msgstr "(%d, %d, %d) olmalıydı\n"
+
+#: disk-utils/fsck.cramfs.c:337
+#, c-format
+msgid "%s: Non-block (%ld) bytes\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:343
+#, c-format
+msgid "%s: Non-size (%ld vs %ld) bytes\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:392
+#, c-format
+msgid "%s: invalid cramfs--bad path length\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:472
+#, fuzzy, c-format
+msgid "%s: compiled without -x support\n"
+msgstr "%s: minix v2 desteÄŸiyle derlenmemiÅŸ\n"
+
+#: disk-utils/fsck.cramfs.c:498
+#, c-format
+msgid "%s: warning--unable to determine filesystem size \n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:508
+#, fuzzy, c-format
+msgid "%s is not a block device or file\n"
+msgstr "%s: bir disket aygıtı değil\n"
+
+#: disk-utils/fsck.cramfs.c:514 disk-utils/fsck.cramfs.c:549
+#, c-format
+msgid "%s: invalid cramfs--file length too short\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:541
+#, c-format
+msgid "%s: invalid cramfs--wrong magic\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:554
+#, c-format
+msgid "%s: warning--file length too long, padded image?\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:564
+#, fuzzy, c-format
+msgid "%s: invalid cramfs--crc error\n"
+msgstr "%s: seçenek çözümleme hatası\n"
+
+#: disk-utils/fsck.cramfs.c:570
+#, c-format
+msgid "%s: warning--old cramfs image, no CRC\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:592
+#, c-format
+msgid "%s: invalid cramfs--bad superblock\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:608
+#, c-format
+msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n"
+msgstr ""
+
+#: disk-utils/fsck.cramfs.c:616
+#, c-format
+msgid "%s: invalid cramfs--invalid file data offset\n"
+msgstr ""
+
#: disk-utils/fsck.minix.c:200
#, c-format
msgid "Usage: %s [-larvsmf] /dev/name\n"
@@ -646,7 +752,7 @@ msgstr "düğüm sayısı çok fazla - en çok 512"
msgid "not enough space, need at least %lu blocks"
msgstr "yer yetersiz, en az %lu blok gerekiyor"
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2057
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2069
#, c-format
msgid "Device: %s\n"
msgstr "Aygıt: %s\n"
@@ -731,6 +837,130 @@ msgstr "%s: Bellek yetersiz!\n"
msgid "mkfs version %s (%s)\n"
msgstr "mkfs sürüm %s (%s)\n"
+#: disk-utils/mkfs.cramfs.c:49
+#, c-format
+msgid ""
+"usage: %s [-h] [-v] [-e edition] [-i file] [-n name] dirname outfile\n"
+" -h print this help\n"
+" -v be verbose\n"
+" -E make all warnings errors (non-zero exit status)\n"
+" -e edition set edition number (part of fsid)\n"
+" -i file insert a file image into the filesystem (requires >= 2.4.0)\n"
+" -n name set name of cramfs filesystem\n"
+" -p pad by %d bytes for boot code\n"
+" -s sort directory entries (old option, ignored)\n"
+" -z make explicit holes (requires >= 2.3.39)\n"
+" dirname root of the filesystem to be compressed\n"
+" outfile output file\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:213
+#, c-format
+msgid ""
+"Very long (%u bytes) filename `%s' found.\n"
+" Please increase MAX_INPUT_NAMELEN in mkcramfs.c and recompile. Exiting.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:371
+msgid "filesystem too big. Exiting.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:422
+msgid ""
+"Exceeded MAXENTRIES. Raise this value in mkcramfs.c and recompile. "
+"Exiting.\n"
+msgstr ""
+
+#. (I don't think this can happen with zlib.)
+#: disk-utils/mkfs.cramfs.c:520
+#, c-format
+msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:537
+#, c-format
+msgid "%6.2f%% (%+d bytes)\t%s\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:705
+#, c-format
+msgid ""
+"warning: guestimate of required size (upper bound) is %LdMB, but maximum "
+"image size is %uMB. We might die prematurely.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:747
+#, fuzzy, c-format
+msgid "Including: %s\n"
+msgstr "kimlik geçersiz: %s\n"
+
+#: disk-utils/mkfs.cramfs.c:753
+#, c-format
+msgid "Directory data: %d bytes\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:761
+#, c-format
+msgid "Everything: %d kilobytes\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:766
+#, fuzzy, c-format
+msgid "Super block: %d bytes\n"
+msgstr "kullanılmış alan = %d bayt\n"
+
+#: disk-utils/mkfs.cramfs.c:773
+#, c-format
+msgid "CRC: %x\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:778
+#, c-format
+msgid "not enough space allocated for ROM image (%Ld allocated, %d used)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:790
+#, c-format
+msgid "ROM image write failed (%d %d)\n"
+msgstr ""
+
+#. (These warnings used to come at the start, but they scroll off the
+#. screen too quickly.)
+#. (can't happen when reading from ext2fs)
+#. bytes, not chars: think UTF8.
+#: disk-utils/mkfs.cramfs.c:799
+#, fuzzy
+msgid "warning: filenames truncated to 255 bytes.\n"
+msgstr "Uyarı: düğüm sayısı çok büyük.\n"
+
+#: disk-utils/mkfs.cramfs.c:802
+msgid "warning: files were skipped due to errors.\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:805
+#, c-format
+msgid "warning: file sizes truncated to %luMB (minus 1 byte).\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:810
+#, c-format
+msgid ""
+"warning: uids truncated to %u bits. (This may be a security concern.)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:815
+#, c-format
+msgid ""
+"warning: gids truncated to %u bits. (This may be a security concern.)\n"
+msgstr ""
+
+#: disk-utils/mkfs.cramfs.c:820
+#, c-format
+msgid ""
+"WARNING: device numbers truncated to %u bits. This almost certainly means\n"
+"that some device files will be wrong.\n"
+msgstr ""
+
#: disk-utils/mkfs.minix.c:181
#, c-format
msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
@@ -878,7 +1108,7 @@ msgid "too many bad pages"
msgstr "çok fazla bozuk sayfa var"
#: disk-utils/mkswap.c:359 misc-utils/look.c:182 misc-utils/setterm.c:1130
-#: text-utils/more.c:2062 text-utils/more.c:2073
+#: text-utils/more.c:2063 text-utils/more.c:2074
msgid "Out of memory"
msgstr "Bellek yetersiz"
@@ -943,9 +1173,9 @@ msgid "Unable to set up swap-space: unreadable"
msgstr "Takas alanı oluşturulamıyor: okunabilir değil"
#: disk-utils/mkswap.c:611
-#, fuzzy, c-format
+#, c-format
msgid "Setting up swapspace version %d, size = %lu KiB\n"
-msgstr "Takas alanı sürüm %d, uzunluk = %lu bayt olarak ayarlanıyor\n"
+msgstr "Takas alanı sürüm %d, uzunluk = %lu Kbayt olarak ayarlanıyor\n"
#: disk-utils/mkswap.c:617
msgid "unable to rewind swap-device"
@@ -1321,7 +1551,7 @@ msgstr " Mantıksal "
#. odd flag on end
#. type id
#. type name
-#: fdisk/cfdisk.c:1996 fdisk/fdisk.c:1306 fdisk/fdisk.c:1594
+#: fdisk/cfdisk.c:1996 fdisk/fdisk.c:1318 fdisk/fdisk.c:1606
#: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:690 fdisk/sfdisk.c:581
msgid "Unknown"
msgstr "Bilinmeyen"
@@ -1860,7 +2090,7 @@ msgstr ""
" sektör/iz sayısı(S) değerlerini değiştirir.\n"
"\n"
-#: fdisk/fdisk.c:194
+#: fdisk/fdisk.c:195
msgid ""
"Usage: fdisk [-b SSZ] [-u] DISK Change partition table\n"
" fdisk -l [-b SSZ] [-u] DISK List partition table(s)\n"
@@ -1882,7 +2112,7 @@ msgstr ""
"-u: Başlangıç ve bitiş sektörlerini (silindir değil) verir\n"
"-b 2048: 2048 baytlık sektörler kullanılır\n"
-#: fdisk/fdisk.c:206
+#: fdisk/fdisk.c:207
msgid ""
"Usage: fdisk [-l] [-b SSZ] [-u] device\n"
"E.g.: fdisk /dev/hda (for the first IDE disk)\n"
@@ -1900,222 +2130,222 @@ msgstr ""
" fdisk /dev/ida/c0d0 (RAID aygıtları)\n"
" ...\n"
-#: fdisk/fdisk.c:215
+#: fdisk/fdisk.c:216
#, c-format
msgid "Unable to open %s\n"
msgstr "%s açılamıyor\n"
-#: fdisk/fdisk.c:219
+#: fdisk/fdisk.c:220
#, c-format
msgid "Unable to read %s\n"
msgstr "%s okunamıyor\n"
-#: fdisk/fdisk.c:223
+#: fdisk/fdisk.c:224
#, c-format
msgid "Unable to seek on %s\n"
msgstr "%s üzerinde erişim olanaksız\n"
-#: fdisk/fdisk.c:227
+#: fdisk/fdisk.c:228
#, c-format
msgid "Unable to write %s\n"
msgstr "%s yazılamıyor\n"
-#: fdisk/fdisk.c:231
+#: fdisk/fdisk.c:232
#, c-format
msgid "BLKGETSIZE ioctl failed on %s\n"
msgstr "%s üzerinde BLKGETSIZE ioctl hata verdi\n"
-#: fdisk/fdisk.c:235
+#: fdisk/fdisk.c:236
msgid "Unable to allocate any more memory\n"
msgstr "Daha fazla bellek ayrılamıyor\n"
-#: fdisk/fdisk.c:238
+#: fdisk/fdisk.c:239
msgid "Fatal error\n"
msgstr "Ölümcül Hata\n"
-#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:359 fdisk/fdisk.c:366
-#: fdisk/fdisk.c:389 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:439
-#: fdisk/fdiskbsdlabel.c:124
+#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:360 fdisk/fdisk.c:367
+#: fdisk/fdisk.c:390 fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:440
+#: fdisk/fdiskbsdlabel.c:129
msgid "Command action"
msgstr " Komut yaptığı iş "
-#: fdisk/fdisk.c:323
+#: fdisk/fdisk.c:324
msgid " a toggle a read only flag"
msgstr " a salt-okunur flamasını kaldırır/indirir"
#. sun
-#: fdisk/fdisk.c:324 fdisk/fdisk.c:368
+#: fdisk/fdisk.c:325 fdisk/fdisk.c:369
msgid " b edit bsd disklabel"
msgstr " b bsd disk etiketini düzenler"
-#: fdisk/fdisk.c:325
+#: fdisk/fdisk.c:326
msgid " c toggle the mountable flag"
msgstr " c bağlanabilir flamasını kaldırır/indirir"
#. sun
-#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:370
+#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:371
msgid " d delete a partition"
msgstr " d bir disk bölümünü siler"
-#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:371
+#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:372
msgid " l list known partition types"
msgstr " l bilinen disk bölümü türlerini listeler"
#. sun
-#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:360 fdisk/fdisk.c:372
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
-#: fdisk/fdiskbsdlabel.c:129
+#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:361 fdisk/fdisk.c:373
+#: fdisk/fdisk.c:398 fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
+#: fdisk/fdiskbsdlabel.c:134
msgid " m print this menu"
msgstr " m bu menüyü gösterir"
-#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373
+#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374
msgid " n add a new partition"
msgstr " n yeni bir disk bölümü ekler"
-#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:361 fdisk/fdisk.c:374
+#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:362 fdisk/fdisk.c:375
msgid " o create a new empty DOS partition table"
msgstr " o yeni bir DOS disk bölümü oluşturur"
-#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:375 fdisk/fdisk.c:398
-#: fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
+#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:376 fdisk/fdisk.c:399
+#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
msgid " p print the partition table"
msgstr " p disk bölümleme tablosunu gösterir"
-#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:362 fdisk/fdisk.c:376
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
-#: fdisk/fdiskbsdlabel.c:132
+#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:363 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:450
+#: fdisk/fdiskbsdlabel.c:137
msgid " q quit without saving changes"
msgstr " q değişiklikleri kaydetmeden çıkar"
-#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:363 fdisk/fdisk.c:377
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:364 fdisk/fdisk.c:378
msgid " s create a new empty Sun disklabel"
msgstr " s yeni bir Sun disk etiketi oluÅŸturur"
#. sun
-#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378
+#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
msgid " t change a partition's system id"
msgstr " t disk bölümünün sistem kimliğini değiştirir"
-#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379
+#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380
msgid " u change display/entry units"
msgstr " u gösterme/girdi birimini değiştirir"
-#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:380 fdisk/fdisk.c:402
-#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:452
+#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381 fdisk/fdisk.c:403
+#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
msgid " v verify the partition table"
msgstr " v disk bölümleme tablosunu doğrular"
-#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381 fdisk/fdisk.c:403
-#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453
+#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:382 fdisk/fdisk.c:404
+#: fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454
msgid " w write table to disk and exit"
msgstr " w tabloyu diskteki yerine yazar ve çıkar"
-#: fdisk/fdisk.c:338 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:339 fdisk/fdisk.c:383
msgid " x extra functionality (experts only)"
msgstr " x fazladan işlevsellik (uzmanlar için)"
-#: fdisk/fdisk.c:342
+#: fdisk/fdisk.c:343
msgid " a select bootable partition"
msgstr " a açılış disk bölümünü seçer"
#. sgi flavour
-#: fdisk/fdisk.c:343
+#: fdisk/fdisk.c:344
msgid " b edit bootfile entry"
msgstr " b açılış dosyası girdilerini düzenler"
#. sgi
-#: fdisk/fdisk.c:344
+#: fdisk/fdisk.c:345
msgid " c select sgi swap partition"
msgstr " c sgi takas bölümü seçilir"
-#: fdisk/fdisk.c:367
+#: fdisk/fdisk.c:368
msgid " a toggle a bootable flag"
msgstr " a açılış flamasını indirir/kaldırır"
-#: fdisk/fdisk.c:369
+#: fdisk/fdisk.c:370
msgid " c toggle the dos compatibility flag"
msgstr " c dos uyumluluk flamasını indirir/kaldırır"
-#: fdisk/fdisk.c:390
+#: fdisk/fdisk.c:391
msgid " a change number of alternate cylinders"
msgstr " a almaşık silindirlerin sayısını değiştirir"
#. sun
-#: fdisk/fdisk.c:391 fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:441
+#: fdisk/fdisk.c:392 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
msgid " c change number of cylinders"
msgstr " c silindir sayısını değiştirir"
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:393 fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:443
msgid " d print the raw data in the partition table"
msgstr " d disk bölümleme tablosunun temel verisini gösterir"
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:394
msgid " e change number of extra sectors per cylinder"
msgstr " e silindir başına fazladan sektör sayısını değiştirir"
#. sun
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:395 fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
msgid " h change number of heads"
msgstr " h kafa sayısını değiştirir"
-#: fdisk/fdisk.c:395
+#: fdisk/fdisk.c:396
msgid " i change interleave factor"
msgstr " i serpiÅŸtirme etkenini deÄŸiÅŸtirir"
#. sun
-#: fdisk/fdisk.c:396
+#: fdisk/fdisk.c:397
msgid " o change rotation speed (rpm)"
msgstr " o devir sayısını değiştirir (rpm)"
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:450
-#: fdisk/fdiskbsdlabel.c:133
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:451
+#: fdisk/fdiskbsdlabel.c:138
msgid " r return to main menu"
msgstr " r ana menüye döner"
-#: fdisk/fdisk.c:401 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:451
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:452
msgid " s change number of sectors/track"
msgstr " s sektör/iz sayısını değiştirir"
-#: fdisk/fdisk.c:404
+#: fdisk/fdisk.c:405
msgid " y change number of physical cylinders"
msgstr " y fiziksel silindir sayısını değiştirir"
-#: fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:440
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:441
msgid " b move beginning of data in a partition"
msgstr " b disk bölümü içindeki verinin başlanıcına gider"
-#: fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:443
+#: fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:444
msgid " e list extended partitions"
msgstr " e ek disk bölümlerini listeler"
#. !sun
-#: fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
msgid " g create an IRIX (SGI) partition table"
msgstr " g IRIX (SGI) disk bölümleme tablosu oluşturur"
#. !sun
-#: fdisk/fdisk.c:444
+#: fdisk/fdisk.c:445
msgid " f fix partition order"
msgstr " f disk bölümleme sırasını düzeltir"
-#: fdisk/fdisk.c:561
+#: fdisk/fdisk.c:562
msgid "You must set"
msgstr "Belirtilmeli"
-#: fdisk/fdisk.c:575
+#: fdisk/fdisk.c:576
msgid "heads"
msgstr "kafa"
-#: fdisk/fdisk.c:577 fdisk/fdisk.c:1142 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:578 fdisk/fdisk.c:1154 fdisk/sfdisk.c:864
msgid "sectors"
msgstr "sektör"
-#: fdisk/fdisk.c:579 fdisk/fdisk.c:1142 fdisk/fdiskbsdlabel.c:464
+#: fdisk/fdisk.c:580 fdisk/fdisk.c:1154 fdisk/fdiskbsdlabel.c:469
#: fdisk/sfdisk.c:864
msgid "cylinders"
msgstr "silindir"
-#: fdisk/fdisk.c:583
+#: fdisk/fdisk.c:584
#, c-format
msgid ""
"%s%s.\n"
@@ -2124,11 +2354,11 @@ msgstr ""
"%s%s.\n"
"Bunu fazladan işlevler menüsünden yapabilirsiniz.\n"
-#: fdisk/fdisk.c:584
+#: fdisk/fdisk.c:585
msgid " and "
msgstr " ve "
-#: fdisk/fdisk.c:601
+#: fdisk/fdisk.c:602
#, c-format
msgid ""
"\n"
@@ -2147,26 +2377,26 @@ msgstr ""
"2) diğer işletim sistemlerinin önyükleme ve disk bölümleme yazılımları\n"
" (örn. DOS FDISK, OS/2 FDISK)\n"
-#: fdisk/fdisk.c:624
+#: fdisk/fdisk.c:625
msgid "Bad offset in primary extended partition\n"
msgstr "Birincil ek disk bölümünde hizalama hatalı\n"
-#: fdisk/fdisk.c:638
+#: fdisk/fdisk.c:639
#, c-format
msgid "Warning: deleting partitions after %d\n"
msgstr "Uyarı: %d bölümden sonra disk bölümleri siliniyor\n"
-#: fdisk/fdisk.c:655
+#: fdisk/fdisk.c:656
#, c-format
msgid "Warning: extra link pointer in partition table %d\n"
msgstr "Uyarı: %d disk bölümleme tablosunda fazladan bağ imleyici\n"
-#: fdisk/fdisk.c:663
+#: fdisk/fdisk.c:664
#, c-format
msgid "Warning: ignoring extra data in partition table %d\n"
msgstr "Uyarı: %d disk bölümleme tablosundaki fazladan veri yoksayılıyor\n"
-#: fdisk/fdisk.c:708
+#: fdisk/fdisk.c:709
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"
@@ -2177,16 +2407,22 @@ msgstr ""
"deÄŸiÅŸiklikler\n"
"bellekte bekleyecek. Aksi takdirde, önceki içerik kurtarılamayacak.\n"
-#: fdisk/fdisk.c:752
+#: fdisk/fdisk.c:753
#, c-format
msgid "Note: sector size is %d (not %d)\n"
msgstr "Bilgi: sektör uzunluğu %d (%d değil)\n"
-#: fdisk/fdisk.c:870
+#: fdisk/fdisk.c:883
msgid "You will not be able to write the partition table.\n"
msgstr "Disk bölümleme tablosunu diskteki yerine kaydetme yetkiniz yok.\n"
-#: fdisk/fdisk.c:903
+#: fdisk/fdisk.c:914
+msgid ""
+"This disk has both DOS and BSD magic.\n"
+"Give the 'b' command to go to BSD mode.\n"
+msgstr ""
+
+#: fdisk/fdisk.c:924
msgid ""
"Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
"disklabel\n"
@@ -2194,16 +2430,16 @@ msgstr ""
"Aygıt ne geçerli bir DOS disk bölümleme tablosu ne de Sun, SGI ya da OSF "
"disk etiketleri içeriyor.\n"
-#: fdisk/fdisk.c:920
+#: fdisk/fdisk.c:942
msgid "Internal error\n"
msgstr "İç hata\n"
-#: fdisk/fdisk.c:942
+#: fdisk/fdisk.c:954
#, c-format
msgid "Ignoring extra extended partition %d\n"
msgstr "Fazladan ek disk bölümü %d yoksayılıyor\n"
-#: fdisk/fdisk.c:954
+#: fdisk/fdisk.c:966
#, c-format
msgid ""
"Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -2212,7 +2448,7 @@ msgstr ""
"Uyarı: geçersiz bayrak 0x%04x %d. disk bölümleme tablosunda w(yaz) ile "
"düzeltilmiş olacak\n"
-#: fdisk/fdisk.c:976
+#: fdisk/fdisk.c:988
msgid ""
"\n"
"got EOF thrice - exiting..\n"
@@ -2220,65 +2456,65 @@ msgstr ""
"\n"
"Dosya sonuna rastlandı - çıkılıyor..\n"
-#: fdisk/fdisk.c:1015
+#: fdisk/fdisk.c:1027
msgid "Hex code (type L to list codes): "
msgstr "Onaltılık kod (kod listesi için L tuşlayın):"
-#: fdisk/fdisk.c:1054
+#: fdisk/fdisk.c:1066
#, c-format
msgid "%s (%d-%d, default %d): "
msgstr "%s (%d-%d, öntanımlı %d): "
-#: fdisk/fdisk.c:1110
+#: fdisk/fdisk.c:1122
#, c-format
msgid "Using default value %d\n"
msgstr "Öntanımlı değer %d kullanılıyor\n"
-#: fdisk/fdisk.c:1114
+#: fdisk/fdisk.c:1126
msgid "Value out of range.\n"
msgstr "Değer kapsamdışı.\n"
-#: fdisk/fdisk.c:1124
+#: fdisk/fdisk.c:1136
msgid "Partition number"
msgstr "Disk bölümü numarası"
-#: fdisk/fdisk.c:1133
+#: fdisk/fdisk.c:1145
#, c-format
msgid "Warning: partition %d has empty type\n"
msgstr "Uyarı: %d disk bölümünün türü boş görünüyor\n"
-#: fdisk/fdisk.c:1140
+#: fdisk/fdisk.c:1152
msgid "cylinder"
msgstr "silindir"
-#: fdisk/fdisk.c:1140
+#: fdisk/fdisk.c:1152
msgid "sector"
msgstr "sektör"
-#: fdisk/fdisk.c:1149
+#: fdisk/fdisk.c:1161
#, c-format
msgid "Changing display/entry units to %s\n"
msgstr "gösterme/girdi birimi %s olarak değiştiriliyor\n"
-#: fdisk/fdisk.c:1160
+#: fdisk/fdisk.c:1172
#, c-format
msgid "WARNING: Partition %d is an extended partition\n"
msgstr "UYARI: %d disk bölümü bir ek disk bölümü\n"
-#: fdisk/fdisk.c:1171
+#: fdisk/fdisk.c:1183
msgid "DOS Compatibility flag is set\n"
msgstr "DOS uyumluluk flaması etkin\n"
-#: fdisk/fdisk.c:1175
+#: fdisk/fdisk.c:1187
msgid "DOS Compatibility flag is not set\n"
msgstr "DOS uyumluluk flaması etkin değil\n"
-#: fdisk/fdisk.c:1261
+#: fdisk/fdisk.c:1273
#, c-format
msgid "Partition %d does not exist yet!\n"
msgstr "%d disk bölümü henüz yok!\n"
-#: fdisk/fdisk.c:1266
+#: fdisk/fdisk.c:1278
msgid ""
"Type 0 means free space to many systems\n"
"(but not to Linux). Having partitions of\n"
@@ -2290,7 +2526,7 @@ msgstr ""
"muhtemelen pek uygun olmayacaktır. 'd' komutunu\n"
"kullanarak bir disk bölümünü silebilirsiniz.\n"
-#: fdisk/fdisk.c:1275
+#: fdisk/fdisk.c:1287
msgid ""
"You cannot change a partition into an extended one or vice versa\n"
"Delete it first.\n"
@@ -2298,7 +2534,7 @@ msgstr ""
"Bir disk bölümünü bir ek bölümün içinde ya da herhangi bir yerde\n"
"değiştiremezsiniz. Önce silmeniz gerekir.\n"
-#: fdisk/fdisk.c:1284
+#: fdisk/fdisk.c:1296
msgid ""
"Consider leaving partition 3 as Whole disk (5),\n"
"as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2307,7 +2543,7 @@ msgstr ""
"Linux'a uygun olsa da SunOS/Solaris gerektirdiÄŸinden,\n"
"3. disk bölümünün diskin tamamı (5) olarak bırakıldığı kabul ediliyor.\n"
-#: fdisk/fdisk.c:1290
+#: fdisk/fdisk.c:1302
msgid ""
"Consider leaving partition 9 as volume header (0),\n"
"and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2316,54 +2552,54 @@ msgstr ""
"IRIX gerektirdiğinden, 11. disk bölümü tüm 'volume' (6) ve\n"
"9. disk bölümü 'volume' başlığı (6) olarak bırakıldığı kabul ediliyor.\n"
-#: fdisk/fdisk.c:1303
+#: fdisk/fdisk.c:1315
#, c-format
msgid "Changed system type of partition %d to %x (%s)\n"
msgstr "%d disk bölümünün sistem türü %x (%s) olarak değiştirildi\n"
-#: fdisk/fdisk.c:1357
+#: fdisk/fdisk.c:1369
#, c-format
msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
msgstr ""
"%d disk bölümü farklı fiziksel/mantıksal başlangıçlara sahip (Linux "
"deÄŸil?):\n"
-#: fdisk/fdisk.c:1359 fdisk/fdisk.c:1367 fdisk/fdisk.c:1376 fdisk/fdisk.c:1385
+#: fdisk/fdisk.c:1371 fdisk/fdisk.c:1379 fdisk/fdisk.c:1388 fdisk/fdisk.c:1397
#, c-format
msgid " phys=(%d, %d, %d) "
msgstr " fiziksel=(%d, %d, %d) "
-#: fdisk/fdisk.c:1360 fdisk/fdisk.c:1368
+#: fdisk/fdisk.c:1372 fdisk/fdisk.c:1380
#, c-format
msgid "logical=(%d, %d, %d)\n"
msgstr "mantıksal=(%d, %d, %d)\n"
-#: fdisk/fdisk.c:1365
+#: fdisk/fdisk.c:1377
#, c-format
msgid "Partition %d has different physical/logical endings:\n"
msgstr "%d disk bölümü farklı fiziksel/mantıksal bitişlere sahip:\n"
-#: fdisk/fdisk.c:1374
+#: fdisk/fdisk.c:1386
#, c-format
msgid "Partition %i does not start on cylinder boundary:\n"
msgstr "%i disk bölümünün başlangıcı silindir sınırları dışında:\n"
-#: fdisk/fdisk.c:1377
+#: fdisk/fdisk.c:1389
#, c-format
msgid "should be (%d, %d, 1)\n"
msgstr "(%d, %d, 1) olmalıydı\n"
-#: fdisk/fdisk.c:1383
+#: fdisk/fdisk.c:1395
#, c-format
msgid "Partition %i does not end on cylinder boundary:\n"
msgstr "%i disk bölümünün bitişi silindir sınırları dışında:\n"
-#: fdisk/fdisk.c:1386
+#: fdisk/fdisk.c:1398
#, c-format
msgid "should be (%d, %d, %d)\n"
msgstr "(%d, %d, %d) olmalıydı\n"
-#: fdisk/fdisk.c:1393
+#: fdisk/fdisk.c:1405
#, c-format
msgid ""
"\n"
@@ -2376,7 +2612,7 @@ msgstr ""
"Birim = %s (%d * %d baytlık)\n"
"\n"
-#: fdisk/fdisk.c:1501
+#: fdisk/fdisk.c:1513
msgid ""
"Nothing to do. Ordering is correct already.\n"
"\n"
@@ -2384,16 +2620,16 @@ msgstr ""
"Hiçbir şey yapılmadı. Sıralama zaten doğru.\n"
"\n"
-#: fdisk/fdisk.c:1565
+#: fdisk/fdisk.c:1577
#, c-format
msgid "%*s Boot Start End Blocks Id System\n"
msgstr "%*s Açılış Başlangıç Bitiş BlokSayısı Kml Sistem\n"
-#: fdisk/fdisk.c:1566 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:675
+#: fdisk/fdisk.c:1578 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:675
msgid "Device"
msgstr "Aygıt"
-#: fdisk/fdisk.c:1603
+#: fdisk/fdisk.c:1615
msgid ""
"\n"
"Partition table entries are not in disk order\n"
@@ -2401,7 +2637,7 @@ msgstr ""
"\n"
"Disk bölümleme tablosu girdileri diskteki sırasında değil\n"
-#: fdisk/fdisk.c:1613
+#: fdisk/fdisk.c:1625
#, c-format
msgid ""
"\n"
@@ -2412,95 +2648,95 @@ msgstr ""
"Disk %s: %d kafa, %d sektör, %d silindir\n"
"\n"
-#: fdisk/fdisk.c:1615
+#: fdisk/fdisk.c:1627
msgid "Nr AF Hd Sec Cyl Hd Sec Cyl Start Size ID\n"
msgstr "No AF Hd Skt Sln Hd Skt Sld Başlangıç Boy Kml\n"
-#: fdisk/fdisk.c:1659
+#: fdisk/fdisk.c:1671
#, c-format
msgid "Warning: partition %d contains sector 0\n"
msgstr "Uyarı: %d disk bölümü 0. sektörü içeriyor\n"
-#: fdisk/fdisk.c:1662
+#: fdisk/fdisk.c:1674
#, c-format
msgid "Partition %d: head %d greater than maximum %d\n"
msgstr ""
"%d disk bölümü: kafa sayısı %d en çok olabileceği %d değerinden büyük\n"
-#: fdisk/fdisk.c:1665
+#: fdisk/fdisk.c:1677
#, c-format
msgid "Partition %d: sector %d greater than maximum %d\n"
msgstr ""
"%d disk bölümü: sektör sayısı %d en çok olabileceği %d değerinden büyük\n"
-#: fdisk/fdisk.c:1668
+#: fdisk/fdisk.c:1680
#, c-format
msgid "Partitions %d: cylinder %d greater than maximum %d\n"
msgstr ""
"%d disk bölümü: silindir sayısı %d en çok olabileceği %d değerinden büyük\n"
-#: fdisk/fdisk.c:1672
+#: fdisk/fdisk.c:1684
#, c-format
msgid "Partition %d: previous sectors %d disagrees with total %d\n"
msgstr "%d disk bölümü: önceki sektör sayısı %d toplam %d ile çelişiyor\n"
-#: fdisk/fdisk.c:1704
+#: fdisk/fdisk.c:1716
#, c-format
msgid "Warning: bad start-of-data in partition %d\n"
msgstr "Uyarı: %d disk bölümünün veri-başlangıcı hatalı\n"
-#: fdisk/fdisk.c:1712
+#: fdisk/fdisk.c:1724
#, c-format
msgid "Warning: partition %d overlaps partition %d.\n"
msgstr "Uyarı: %d ile %d disk bölümleri birbirine girmiş.\n"
-#: fdisk/fdisk.c:1732
+#: fdisk/fdisk.c:1744
#, c-format
msgid "Warning: partition %d is empty\n"
msgstr "Uyarı: %d disk bölümü boş\n"
-#: fdisk/fdisk.c:1737
+#: fdisk/fdisk.c:1749
#, c-format
msgid "Logical partition %d not entirely in partition %d\n"
msgstr "Mantıksal disk bölümü %d tamamen %d disk bölümünün içinde değil\n"
-#: fdisk/fdisk.c:1743
+#: fdisk/fdisk.c:1755
#, c-format
msgid "Total allocated sectors %d greater than the maximum %d\n"
msgstr ""
"Tahsis edilen sektör sayısı %d en fazla olması gereken %d değerinden büyük\n"
-#: fdisk/fdisk.c:1746
+#: fdisk/fdisk.c:1758
#, c-format
msgid "%d unallocated sectors\n"
msgstr "%d sektör kullanılmadı\n"
-#: fdisk/fdisk.c:1759 fdisk/fdisksgilabel.c:661 fdisk/fdisksunlabel.c:505
+#: fdisk/fdisk.c:1771 fdisk/fdisksgilabel.c:661 fdisk/fdisksunlabel.c:505
#, c-format
msgid "Partition %d is already defined. Delete it before re-adding it.\n"
msgstr "%d disk bölümü zaten atanmış. Yeniden eklemeden önce silmelisiniz.\n"
-#: fdisk/fdisk.c:1780 fdisk/fdiskbsdlabel.c:279 fdisk/fdisksgilabel.c:683
+#: fdisk/fdisk.c:1792 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:683
#: fdisk/fdisksunlabel.c:520
#, c-format
msgid "First %s"
msgstr "Ä°lk %s"
-#: fdisk/fdisk.c:1795 fdisk/fdisksunlabel.c:561
+#: fdisk/fdisk.c:1807 fdisk/fdisksunlabel.c:561
#, c-format
msgid "Sector %d is already allocated\n"
msgstr "Sektör %d zaten kullanımda\n"
-#: fdisk/fdisk.c:1831
+#: fdisk/fdisk.c:1843
msgid "No free sectors available\n"
msgstr "Boşta sektör yok\n"
-#: fdisk/fdisk.c:1840 fdisk/fdiskbsdlabel.c:286 fdisk/fdisksunlabel.c:572
+#: fdisk/fdisk.c:1852 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:572
#, c-format
msgid "Last %s or +size or +sizeM or +sizeK"
msgstr "Son %s, +size, +sizeM veya +sizeK"
-#: fdisk/fdisk.c:1905
+#: fdisk/fdisk.c:1917
msgid ""
"\tSorry - this fdisk cannot handle AIX disk labels.\n"
"\tIf you want to add DOS-type partitions, create\n"
@@ -2512,16 +2748,16 @@ msgstr ""
"\tbir DOS disk bölümleme tablosu oluşturun. (o ile)\n"
"\tUYARI: Bu işlem ile diskteki tüm bilgile kaybalacaktır.\n"
-#: fdisk/fdisk.c:1914 fdisk/fdiskbsdlabel.c:613
+#: fdisk/fdisk.c:1926 fdisk/fdiskbsdlabel.c:617
msgid "The maximum number of partitions has been created\n"
msgstr "Oluşturulabilecek disk bölümlerinin tümü oluşturuldu\n"
-#: fdisk/fdisk.c:1924
+#: fdisk/fdisk.c:1936
msgid "You must delete some partition and add an extended partition first\n"
msgstr ""
"Önce bazı disk bölümlerini silip ondan sonra ek disk bölümünü eklemelisiniz\n"
-#: fdisk/fdisk.c:1929
+#: fdisk/fdisk.c:1941
#, c-format
msgid ""
"Command action\n"
@@ -2532,20 +2768,20 @@ msgstr ""
" %s\n"
" p birincil disk bölümü (1-4)\n"
-#: fdisk/fdisk.c:1931
+#: fdisk/fdisk.c:1943
msgid "l logical (5 or over)"
msgstr "l mantıksal (5 veya üzeri)"
-#: fdisk/fdisk.c:1931
+#: fdisk/fdisk.c:1943
msgid "e extended"
msgstr "e ek"
-#: fdisk/fdisk.c:1948
+#: fdisk/fdisk.c:1960
#, c-format
msgid "Invalid partition number for type `%c'\n"
msgstr "Tür '%c' için disk bölümü numarası geçersiz\n"
-#: fdisk/fdisk.c:1984
+#: fdisk/fdisk.c:1996
msgid ""
"The partition table has been altered!\n"
"\n"
@@ -2553,11 +2789,11 @@ msgstr ""
"Disk bölümleme tablosu zaten değişmişti!\n"
"\n"
-#: fdisk/fdisk.c:1993
+#: fdisk/fdisk.c:2005
msgid "Calling ioctl() to re-read partition table.\n"
msgstr "Disk bölümleme tablosunu yeniden okumak için ioctl() çağrılıyor.\n"
-#: fdisk/fdisk.c:2009
+#: fdisk/fdisk.c:2021
#, c-format
msgid ""
"\n"
@@ -2570,7 +2806,7 @@ msgstr ""
"Çekirdek hala eski tabloyu kullanıyor.\n"
"Yeni tablo makinayı yeniden başlattığınızda geçerli olacak.\n"
-#: fdisk/fdisk.c:2019
+#: fdisk/fdisk.c:2031
msgid ""
"\n"
"WARNING: If you have created or modified any DOS 6.x\n"
@@ -2582,65 +2818,65 @@ msgstr ""
"değişiklik yaptıysanız, lütfen fdisk man sayfalarındaki\n"
"ek bilgileri okuyun.\n"
-#: fdisk/fdisk.c:2026
+#: fdisk/fdisk.c:2038
msgid "Syncing disks.\n"
msgstr "Diskler eşzamanlanıyor.\n"
-#: fdisk/fdisk.c:2073
+#: fdisk/fdisk.c:2085
#, c-format
msgid "Partition %d has no data area\n"
msgstr "%d disk bölümü veri alanına sahip değil\n"
-#: fdisk/fdisk.c:2078
+#: fdisk/fdisk.c:2090
msgid "New beginning of data"
msgstr "Yeni veri başlangıcı"
-#: fdisk/fdisk.c:2094
+#: fdisk/fdisk.c:2106
msgid "Expert command (m for help): "
msgstr "Uzman komutları (yardım için m): "
-#: fdisk/fdisk.c:2107
+#: fdisk/fdisk.c:2119
msgid "Number of cylinders"
msgstr "Silindir sayısı"
-#: fdisk/fdisk.c:2134
+#: fdisk/fdisk.c:2146
msgid "Number of heads"
msgstr "Kafa sayısı"
-#: fdisk/fdisk.c:2159
+#: fdisk/fdisk.c:2171
msgid "Number of sectors"
msgstr "Sektör sayısı"
-#: fdisk/fdisk.c:2162
+#: fdisk/fdisk.c:2174
msgid "Warning: setting sector offset for DOS compatiblity\n"
msgstr "Uyarı: Sektör hizalaması DOS uyumlu olarak yapılıyor\n"
-#: fdisk/fdisk.c:2237
+#: fdisk/fdisk.c:2249
#, c-format
msgid "Disk %s doesn't contain a valid partition table\n"
msgstr "%s diski geçerli bir disk bölümleme tablosu içermiyor\n"
-#: fdisk/fdisk.c:2251
+#: fdisk/fdisk.c:2263
#, c-format
msgid "Cannot open %s\n"
msgstr "%s açılamıyor\n"
-#: fdisk/fdisk.c:2267 fdisk/sfdisk.c:2363
+#: fdisk/fdisk.c:2279 fdisk/sfdisk.c:2363
#, c-format
msgid "cannot open %s\n"
msgstr "%s açılamıyor\n"
-#: fdisk/fdisk.c:2289
+#: fdisk/fdisk.c:2301
#, c-format
msgid "%c: unknown command\n"
msgstr "%c: komut bilinmiyor\n"
-#: fdisk/fdisk.c:2339
+#: fdisk/fdisk.c:2351
msgid "This kernel finds the sector size itself - -b option ignored\n"
msgstr ""
"Bu çekirdek sektör uzunluğunu kendisi bulur. - -b seçeneği yoksayıldı\n"
-#: fdisk/fdisk.c:2342
+#: fdisk/fdisk.c:2355
msgid ""
"Warning: the -b (set sector size) option should be used with one specified "
"device\n"
@@ -2648,20 +2884,19 @@ msgstr ""
"Uyarı: -b (sektör uzunluğu ayarı) seçeneği tek aygıt ile kullanılmış "
"olmalıydı\n"
-#: fdisk/fdisk.c:2405
-#, c-format
-msgid ""
-"Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
-"To return to DOS partition table mode, use the 'r' command.\n"
+#. OSF label, and no DOS label
+#: fdisk/fdisk.c:2414
+#, fuzzy, c-format
+msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
msgstr ""
"%s üzerinde OSF/1 disk etiketi saptandı, disk etiketi kipine giriliyor.\n"
"DOS disk bölümleme tablosu kipine dönmek için 'r' komutunu kullanın.\n"
-#: fdisk/fdisk.c:2413
+#: fdisk/fdisk.c:2424
msgid "Command (m for help): "
msgstr "Komut (yardım için m): "
-#: fdisk/fdisk.c:2429
+#: fdisk/fdisk.c:2440
#, c-format
msgid ""
"\n"
@@ -2670,15 +2905,15 @@ msgstr ""
"\n"
"Şu anki önyükleme dosyası: %s\n"
-#: fdisk/fdisk.c:2431
+#: fdisk/fdisk.c:2442
msgid "Please enter the name of the new boot file: "
msgstr "Lütfen yeni açılış dosyasının ismini giriniz:"
-#: fdisk/fdisk.c:2433
+#: fdisk/fdisk.c:2444
msgid "Boot file unchanged\n"
msgstr "Açılış dosyası değiştirilmedi\n"
-#: fdisk/fdisk.c:2497
+#: fdisk/fdisk.c:2508
msgid ""
"\n"
"\tSorry, no experts menu for SGI partition tables available.\n"
@@ -2716,7 +2951,7 @@ msgstr ""
"\t emin olun. (Aksi takdirde bir AIXpert haline\n"
"\t gelebilirsiniz.)"
-#: fdisk/fdiskbsdlabel.c:117
+#: fdisk/fdiskbsdlabel.c:122
#, c-format
msgid ""
"\n"
@@ -2725,167 +2960,167 @@ msgstr ""
"\n"
"Aygıt için BSD disk etiketi: %s\n"
-#: fdisk/fdiskbsdlabel.c:125
+#: fdisk/fdiskbsdlabel.c:130
msgid " d delete a BSD partition"
msgstr " d bir BSD disk bölümünü siler"
-#: fdisk/fdiskbsdlabel.c:126
+#: fdisk/fdiskbsdlabel.c:131
msgid " e edit drive data"
msgstr " e aygıt verisini düzenler"
-#: fdisk/fdiskbsdlabel.c:127
+#: fdisk/fdiskbsdlabel.c:132
msgid " i install bootstrap"
msgstr " i önyükleyici kurar"
-#: fdisk/fdiskbsdlabel.c:128
+#: fdisk/fdiskbsdlabel.c:133
msgid " l list known filesystem types"
msgstr " l bilinen dosya sistemi türlerini listeler"
-#: fdisk/fdiskbsdlabel.c:130
+#: fdisk/fdiskbsdlabel.c:135
msgid " n add a new BSD partition"
msgstr " n yeni bir BSD disk bölümü ekler"
-#: fdisk/fdiskbsdlabel.c:131
+#: fdisk/fdiskbsdlabel.c:136
msgid " p print BSD partition table"
msgstr " p BSD disk bölümleme tablosunu gösterir"
-#: fdisk/fdiskbsdlabel.c:134
+#: fdisk/fdiskbsdlabel.c:139
msgid " s show complete disklabel"
msgstr " s disk etiketinin tamamını gösterir"
-#: fdisk/fdiskbsdlabel.c:135
+#: fdisk/fdiskbsdlabel.c:140
msgid " t change a partition's filesystem id"
msgstr " t disk bölümünün dosya sistemi kimliğini gösterir"
-#: fdisk/fdiskbsdlabel.c:136
+#: fdisk/fdiskbsdlabel.c:141
msgid " u change units (cylinders/sectors)"
msgstr " u birim değiştirir (silindir/sektör)"
-#: fdisk/fdiskbsdlabel.c:137
+#: fdisk/fdiskbsdlabel.c:142
msgid " w write disklabel to disk"
msgstr " w disk etiketini diske yazar"
-#: fdisk/fdiskbsdlabel.c:139
+#: fdisk/fdiskbsdlabel.c:144
msgid " x link BSD partition to non-BSD partition"
msgstr " x BSD disk bölümünü BSD-olmayan bir bölüme bağlar"
-#: fdisk/fdiskbsdlabel.c:171
+#: fdisk/fdiskbsdlabel.c:176
#, c-format
msgid "Partition %s has invalid starting sector 0.\n"
msgstr "%s disk bölümü geçersiz başlangıç sektör 0 değerine sahip.\n"
-#: fdisk/fdiskbsdlabel.c:175
+#: fdisk/fdiskbsdlabel.c:180
#, c-format
msgid "Reading disklabel of %s at sector %d.\n"
msgstr "%s disk etiketi sektör %d den okunuyor.\n"
-#: fdisk/fdiskbsdlabel.c:185
+#: fdisk/fdiskbsdlabel.c:190
#, c-format
msgid "There is no *BSD partition on %s.\n"
msgstr "%s üzerinde *BSD disk bölümü yok.\n"
-#: fdisk/fdiskbsdlabel.c:199
+#: fdisk/fdiskbsdlabel.c:204
msgid "BSD disklabel command (m for help): "
msgstr "BSD disk etiketi komutu (yardım için m): "
-#: fdisk/fdiskbsdlabel.c:313
+#: fdisk/fdiskbsdlabel.c:318
#, c-format
msgid "type: %s\n"
msgstr "türü: %s\n"
-#: fdisk/fdiskbsdlabel.c:315
+#: fdisk/fdiskbsdlabel.c:320
#, c-format
msgid "type: %d\n"
msgstr "türü: %d\n"
-#: fdisk/fdiskbsdlabel.c:316
+#: fdisk/fdiskbsdlabel.c:321
#, c-format
msgid "disk: %.*s\n"
msgstr "disk: %.*s\n"
-#: fdisk/fdiskbsdlabel.c:317
+#: fdisk/fdiskbsdlabel.c:322
#, c-format
msgid "label: %.*s\n"
msgstr "etiket: %.*s\n"
-#: fdisk/fdiskbsdlabel.c:318
+#: fdisk/fdiskbsdlabel.c:323
msgid "flags:"
msgstr "flamalar:"
-#: fdisk/fdiskbsdlabel.c:320
+#: fdisk/fdiskbsdlabel.c:325
msgid " removable"
msgstr " silinebilir"
-#: fdisk/fdiskbsdlabel.c:322
+#: fdisk/fdiskbsdlabel.c:327
msgid " ecc"
msgstr " ecc"
-#: fdisk/fdiskbsdlabel.c:324
+#: fdisk/fdiskbsdlabel.c:329
msgid " badsect"
msgstr " bozukSektör"
#. On various machines the fields of *lp are short/int/long
#. In order to avoid problems, we cast them all to long.
-#: fdisk/fdiskbsdlabel.c:328
+#: fdisk/fdiskbsdlabel.c:333
#, c-format
msgid "bytes/sector: %ld\n"
msgstr "bayt/sektör: %ld\n"
-#: fdisk/fdiskbsdlabel.c:329
+#: fdisk/fdiskbsdlabel.c:334
#, c-format
msgid "sectors/track: %ld\n"
msgstr "sektör/iz: %ld\n"
-#: fdisk/fdiskbsdlabel.c:330
+#: fdisk/fdiskbsdlabel.c:335
#, c-format
msgid "tracks/cylinder: %ld\n"
msgstr "iz/silindir: %ld\n"
-#: fdisk/fdiskbsdlabel.c:331
+#: fdisk/fdiskbsdlabel.c:336
#, c-format
msgid "sectors/cylinder: %ld\n"
msgstr "sektör/silindir: %ld\n"
-#: fdisk/fdiskbsdlabel.c:332
+#: fdisk/fdiskbsdlabel.c:337
#, c-format
msgid "cylinders: %ld\n"
msgstr "silindir sayısı: %ld\n"
-#: fdisk/fdiskbsdlabel.c:333
+#: fdisk/fdiskbsdlabel.c:338
#, c-format
msgid "rpm: %d\n"
msgstr "devir sayısı: %d\n"
-#: fdisk/fdiskbsdlabel.c:334
+#: fdisk/fdiskbsdlabel.c:339
#, c-format
msgid "interleave: %d\n"
msgstr "serpiÅŸtirme: %d\n"
-#: fdisk/fdiskbsdlabel.c:335
+#: fdisk/fdiskbsdlabel.c:340
#, c-format
msgid "trackskew: %d\n"
msgstr "izkayması: %d\n"
-#: fdisk/fdiskbsdlabel.c:336
+#: fdisk/fdiskbsdlabel.c:341
#, c-format
msgid "cylinderskew: %d\n"
msgstr "silindirkayması: %d\n"
-#: fdisk/fdiskbsdlabel.c:337
+#: fdisk/fdiskbsdlabel.c:342
#, c-format
msgid "headswitch: %ld\t\t# milliseconds\n"
msgstr "kafadeÄŸiÅŸimi %ld\t\t# milisaniye\n"
-#: fdisk/fdiskbsdlabel.c:339
+#: fdisk/fdiskbsdlabel.c:344
#, c-format
msgid "track-to-track seek: %ld\t# milliseconds\n"
msgstr "izden-ize geçiş: %ld\t# milisaniye\n"
-#: fdisk/fdiskbsdlabel.c:341
+#: fdisk/fdiskbsdlabel.c:346
msgid "drivedata: "
msgstr "aygıtverisi:"
-#: fdisk/fdiskbsdlabel.c:350
+#: fdisk/fdiskbsdlabel.c:355
#, c-format
msgid ""
"\n"
@@ -2894,97 +3129,97 @@ msgstr ""
"\n"
"%d disk bölümü:\n"
-#: fdisk/fdiskbsdlabel.c:351
+#: fdisk/fdiskbsdlabel.c:356
msgid "# start end size fstype [fsize bsize cpg]\n"
msgstr "# başlangıç bitiş boy dstürü [dboyu bboyu cpg]\n"
-#: fdisk/fdiskbsdlabel.c:400 fdisk/fdiskbsdlabel.c:403
+#: fdisk/fdiskbsdlabel.c:405 fdisk/fdiskbsdlabel.c:408
#, c-format
msgid "Writing disklabel to %s.\n"
msgstr "Disk etiketi %s üzerine yazılıyor.\n"
-#: fdisk/fdiskbsdlabel.c:415 fdisk/fdiskbsdlabel.c:417
+#: fdisk/fdiskbsdlabel.c:420 fdisk/fdiskbsdlabel.c:422
#, c-format
msgid "%s contains no disklabel.\n"
msgstr "%s disk etiketi içermiyor.\n"
-#: fdisk/fdiskbsdlabel.c:422
+#: fdisk/fdiskbsdlabel.c:427
msgid "Do you want to create a disklabel? (y/n) "
msgstr "Bir disk etiketi oluÅŸturmak ister misiniz? (e/h) "
-#: fdisk/fdiskbsdlabel.c:461
+#: fdisk/fdiskbsdlabel.c:466
msgid "bytes/sector"
msgstr "bayt/sektör"
-#: fdisk/fdiskbsdlabel.c:462
+#: fdisk/fdiskbsdlabel.c:467
msgid "sectors/track"
msgstr "sektör/iz"
-#: fdisk/fdiskbsdlabel.c:463
+#: fdisk/fdiskbsdlabel.c:468
msgid "tracks/cylinder"
msgstr "iz/silindir"
-#: fdisk/fdiskbsdlabel.c:471
+#: fdisk/fdiskbsdlabel.c:476
msgid "sectors/cylinder"
msgstr "sektör/silindir"
-#: fdisk/fdiskbsdlabel.c:475
+#: fdisk/fdiskbsdlabel.c:480
msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
msgstr " <= sektör/iz * iz/silindir (öntanımlı) olmalı.\n"
-#: fdisk/fdiskbsdlabel.c:477
+#: fdisk/fdiskbsdlabel.c:482
msgid "rpm"
msgstr "rpm"
-#: fdisk/fdiskbsdlabel.c:478
+#: fdisk/fdiskbsdlabel.c:483
msgid "interleave"
msgstr "serpiÅŸtirme"
-#: fdisk/fdiskbsdlabel.c:479
+#: fdisk/fdiskbsdlabel.c:484
msgid "trackskew"
msgstr "izkayması"
-#: fdisk/fdiskbsdlabel.c:480
+#: fdisk/fdiskbsdlabel.c:485
msgid "cylinderskew"
msgstr "silindirkayması"
-#: fdisk/fdiskbsdlabel.c:481
+#: fdisk/fdiskbsdlabel.c:486
msgid "headswitch"
msgstr "kafadeÄŸiÅŸtirme"
-#: fdisk/fdiskbsdlabel.c:482
+#: fdisk/fdiskbsdlabel.c:487
msgid "track-to-track seek"
msgstr "izden-ize geçiş"
-#: fdisk/fdiskbsdlabel.c:523
+#: fdisk/fdiskbsdlabel.c:528
#, c-format
msgid "Bootstrap: %sboot -> boot%s (%s): "
msgstr "Önyükleyici: %sboot -> boot%s (%s): "
-#: fdisk/fdiskbsdlabel.c:548
+#: fdisk/fdiskbsdlabel.c:553
msgid "Bootstrap overlaps with disk label!\n"
msgstr "Önyükleyici disk etiketinin alanına giriyor!\n"
-#: fdisk/fdiskbsdlabel.c:569 fdisk/fdiskbsdlabel.c:571
+#: fdisk/fdiskbsdlabel.c:574 fdisk/fdiskbsdlabel.c:576
#, c-format
msgid "Bootstrap installed on %s.\n"
msgstr "%s üzerine önyükleyici kuruldu.\n"
-#: fdisk/fdiskbsdlabel.c:593
+#: fdisk/fdiskbsdlabel.c:598
#, c-format
msgid "Partition (a-%c): "
msgstr "Disk bölümü (a-%c): "
-#: fdisk/fdiskbsdlabel.c:624
+#: fdisk/fdiskbsdlabel.c:629
msgid "This partition already exists.\n"
msgstr "Bu disk bölümü zaten var.\n"
-#: fdisk/fdiskbsdlabel.c:744
+#: fdisk/fdiskbsdlabel.c:755
#, c-format
msgid "Warning: too many partitions (%d, maximum is %d).\n"
msgstr "Uyarı: disk bölümü sayısı çok fazla (%d, en çok %d).\n"
-#: fdisk/fdiskbsdlabel.c:791
+#: fdisk/fdiskbsdlabel.c:803
msgid ""
"\n"
"Syncing disks.\n"
@@ -4948,137 +5183,123 @@ msgstr "getopt (geliÅŸmiÅŸ) 1.1.2\n"
msgid "internal error, contact the author."
msgstr "iç hata, yazara bildirin."
-#: hwclock/cmos.c:168
+#: hwclock/cmos.c:172
msgid "booted from MILO\n"
msgstr "MILO'dan açıldı\n"
-#: hwclock/cmos.c:177
+#: hwclock/cmos.c:181
msgid "Ruffian BCD clock\n"
msgstr "Ruffian BCD clock\n"
-#: hwclock/cmos.c:193
+#: hwclock/cmos.c:197
#, c-format
msgid "clockport adjusted to 0x%x\n"
msgstr "saatportu 0x%x'e ayarlandı\n"
-#: hwclock/cmos.c:205
+#: hwclock/cmos.c:209
msgid "funky TOY!\n"
msgstr "funky TimeOfYear!\n"
-#: hwclock/cmos.c:259
+#: hwclock/cmos.c:263
#, c-format
msgid "%s: atomic %s failed for 1000 iterations!"
msgstr "%s: 1000 yineleme için atomik %s başarısız!"
-#: hwclock/cmos.c:583
+#: hwclock/cmos.c:587
#, c-format
msgid "Cannot open /dev/port: %s"
msgstr "/dev/port açılamıyor: %s"
-#: hwclock/cmos.c:590
+#: hwclock/cmos.c:594
msgid "I failed to get permission because I didn't try.\n"
msgstr "Denenmediğinden erişim izinleri alınamadı.\n"
-#: hwclock/cmos.c:593
+#: hwclock/cmos.c:597
#, c-format
msgid "%s is unable to get I/O port access: the iopl(3) call failed.\n"
msgstr "%s G/Ç portu erişimi alamıyor: iopl(3) çağrısı başarısız.\n"
-#: hwclock/cmos.c:596
+#: hwclock/cmos.c:600
msgid "Probably you need root privileges.\n"
msgstr "Size root yetkileri gerekli.\n"
-#: hwclock/hwclock.c:219
+#: hwclock/hwclock.c:223
#, c-format
msgid "Assuming hardware clock is kept in %s time.\n"
msgstr "Donanım saatinin %s de tutulduğu varsayılıyor.\n"
-#: hwclock/hwclock.c:220 hwclock/hwclock.c:314
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:318
msgid "UTC"
msgstr "UTC"
-#: hwclock/hwclock.c:220 hwclock/hwclock.c:313
+#: hwclock/hwclock.c:224 hwclock/hwclock.c:317
msgid "local"
msgstr "yerel"
-#: hwclock/hwclock.c:297
+#: hwclock/hwclock.c:303
#, c-format
msgid "%s: Warning: unrecognized third line in adjtime file\n"
msgstr "%s: Uyarı: adjtime dosyasındaki üçüncü satır anlaşılamadı\n"
-#: hwclock/hwclock.c:299
+#: hwclock/hwclock.c:305
msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
msgstr "(Gereken: `UTC', `LOCAL' ya da hiçbiri.)\n"
-#: hwclock/hwclock.c:308
+#: hwclock/hwclock.c:312
#, c-format
msgid "Last drift adjustment done at %ld seconds after 1969\n"
msgstr "Son sapma ayarı 1969 dan sonraki %ld. saniyede yapıldı\n"
-#: hwclock/hwclock.c:310
+#: hwclock/hwclock.c:314
#, c-format
msgid "Last calibration done at %ld seconds after 1969\n"
msgstr "Son düzeltme 1969 dan sonraki %ld. saniyede yapıldı\n"
-#: hwclock/hwclock.c:312
+#: hwclock/hwclock.c:316
#, c-format
msgid "Hardware clock is on %s time\n"
msgstr "Donanım saati %s den beri açık\n"
-#: hwclock/hwclock.c:314
+#: hwclock/hwclock.c:318
msgid "unknown"
msgstr "bilinmeyen"
-#. -----------------------------------------------------------------------------
-#. 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.
-#.
-#. -----------------------------------------------------------------------------
-#: hwclock/hwclock.c:336
+#: hwclock/hwclock.c:342
msgid "Waiting for clock tick...\n"
msgstr "saat tiki için bekleniyor...\n"
-#: hwclock/hwclock.c:340
+#: hwclock/hwclock.c:346
msgid "...got clock tick\n"
msgstr "... saat tiki alındı\n"
-#: hwclock/hwclock.c:391
+#: hwclock/hwclock.c:399
#, c-format
msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
msgstr "Donanım saatinde geçersiz değerler: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
-#: hwclock/hwclock.c:399
+#: hwclock/hwclock.c:407
#, c-format
msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
msgstr ""
"Donanım zamanı: %4d/%.2d/%.2d %.2d:%.2d:%.2d = 1969 yılından beri %ld "
"saniye\n"
-#: hwclock/hwclock.c:427
+#: hwclock/hwclock.c:435
#, c-format
msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
msgstr "Donanım saatinden okunan: %4d/%.2d/%.2d %02d:%02d:%02d\n"
-#: hwclock/hwclock.c:454
+#: hwclock/hwclock.c:462
#, c-format
msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
msgstr ""
"Donanım Saati %.2d:%.2d:%.2d = 1969 dan beri %ld saniye olarak ayarlanıyor\n"
-#: hwclock/hwclock.c:460
+#: hwclock/hwclock.c:468
msgid "Clock not changed - testing only.\n"
msgstr "Saat deÄŸiÅŸmeyecek - sadece test ediliyor.\n"
-#: hwclock/hwclock.c:508
+#: hwclock/hwclock.c:516
#, c-format
msgid ""
"Time elapsed since reference time has been %.6f seconds.\n"
@@ -5087,7 +5308,7 @@ msgstr ""
"Başlangıç zamanından beri geçen zaman %.6f saniye oldu.\n"
"Gecikme sonraki tam saniyeye kadar olandan daha fazla.\n"
-#: hwclock/hwclock.c:532
+#: hwclock/hwclock.c:540
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"
@@ -5095,20 +5316,20 @@ msgstr ""
"Donanım saati yazmaçları hem geçersiz (ayın 50. günü gibi) hem de elde "
"edilebilir olmayan bir aralıkta (2500 yılı gibi) değerler içeriyor.\n"
-#: hwclock/hwclock.c:542
+#: hwclock/hwclock.c:550
#, c-format
msgid "%s %.6f seconds\n"
msgstr "%s %.6f saniye\n"
-#: hwclock/hwclock.c:576
+#: hwclock/hwclock.c:584
msgid "No --date option specified.\n"
msgstr "--date seçeneği belirtilmemiş.\n"
-#: hwclock/hwclock.c:582
+#: hwclock/hwclock.c:590
msgid "--date argument too long\n"
msgstr "--date ile verilen argüman çok uzun\n"
-#: hwclock/hwclock.c:589
+#: hwclock/hwclock.c:597
msgid ""
"The value of the --date option is not a valid date.\n"
"In particular, it contains quotation marks.\n"
@@ -5116,22 +5337,22 @@ msgstr ""
"--date seçeneğinin değeri geçersiz.\n"
"Ayrıca tırnak işaretleri de içeriyor.\n"
-#: hwclock/hwclock.c:597
+#: hwclock/hwclock.c:605
#, c-format
msgid "Issuing date command: %s\n"
msgstr "Verilen date komutu: %s\n"
-#: hwclock/hwclock.c:601
+#: hwclock/hwclock.c:609
msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
msgstr ""
"'date' uygulaması /bin/sh kabuğunda çalıştırılamıyor. popen() başarısız"
-#: hwclock/hwclock.c:609
+#: hwclock/hwclock.c:617
#, c-format
msgid "response from date command = %s\n"
msgstr "date komutunun sonucu = %s\n"
-#: hwclock/hwclock.c:611
+#: hwclock/hwclock.c:619
#, c-format
msgid ""
"The date command issued by %s returned unexpected results.\n"
@@ -5146,7 +5367,7 @@ msgstr ""
"Sonuç:\n"
" %s\n"
-#: hwclock/hwclock.c:623
+#: hwclock/hwclock.c:631
#, c-format
msgid ""
"The date command issued by %s returned something other than an integer where "
@@ -5163,12 +5384,12 @@ msgstr ""
"Sonuç:\n"
" %s\n"
-#: hwclock/hwclock.c:634
+#: hwclock/hwclock.c:642
#, c-format
msgid "date string %s equates to %ld seconds since 1969.\n"
msgstr "tarih dizgesi %s 1969 dan beri %ld saniyeye eÅŸittir.\n"
-#: hwclock/hwclock.c:666
+#: hwclock/hwclock.c:674
msgid ""
"The Hardware Clock does not contain a valid time, so we cannot set the "
"System Time from it.\n"
@@ -5176,33 +5397,33 @@ msgstr ""
"Donanım Saati geçerli bir zaman değeri içermediğinden Sistem Zamanı o değere "
"ayarlanamaz.\n"
-#: hwclock/hwclock.c:688
+#: hwclock/hwclock.c:696
msgid "Calling settimeofday:\n"
msgstr "settimeofday çağrısı:\n"
-#: hwclock/hwclock.c:689
+#: hwclock/hwclock.c:697
#, c-format
msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
-#: hwclock/hwclock.c:691
+#: hwclock/hwclock.c:699
#, c-format
msgid "\ttz.tz_minuteswest = %d\n"
msgstr "\ttz.tz_minuteswest = %d\n"
-#: hwclock/hwclock.c:694
+#: hwclock/hwclock.c:702
msgid "Not setting system clock because running in test mode.\n"
msgstr "Test kipinde çalışıldığından sistem saati değişmiyor.\n"
-#: hwclock/hwclock.c:702
+#: hwclock/hwclock.c:711
msgid "Must be superuser to set system clock.\n"
msgstr "Sistem saatinin ayarlanması root yetkisindedir.\n"
-#: hwclock/hwclock.c:704
+#: hwclock/hwclock.c:714
msgid "settimeofday() failed"
msgstr "settimeofday() başarısız"
-#: hwclock/hwclock.c:737
+#: hwclock/hwclock.c:744
msgid ""
"Not adjusting drift factor because the Hardware Clock previously contained "
"garbage.\n"
@@ -5210,7 +5431,16 @@ msgstr ""
"Donanım saatinin önceki değerleri bozuk olduğundan sapma faktörü "
"ayarlanamıyor.\n"
-#: hwclock/hwclock.c:741
+#: hwclock/hwclock.c:749
+#, fuzzy
+msgid ""
+"Not adjusting drift factor because last calibration time is zero,\n"
+"so history is bad and calibration startover is necessary.\n"
+msgstr ""
+"Son düzeltmeden beri 1 günden az zaman geçtiğinden sapma faktörü "
+"ayarlanamıyor.\n"
+
+#: hwclock/hwclock.c:755
msgid ""
"Not adjusting drift factor because it has been less than a day since the "
"last calibration.\n"
@@ -5218,10 +5448,10 @@ msgstr ""
"Son düzeltmeden beri 1 günden az zaman geçtiğinden sapma faktörü "
"ayarlanamıyor.\n"
-#: hwclock/hwclock.c:750
-#, c-format
+#: hwclock/hwclock.c:803
+#, fuzzy, c-format
msgid ""
-"Clock drifted %d seconds in the past %d seconds in spite of a drift factor "
+"Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor "
"of %f seconds/day.\n"
"Adjusting drift factor by %f seconds/day\n"
msgstr ""
@@ -5229,21 +5459,21 @@ msgstr ""
"raÄŸmen\n"
"Sapma faktörü %f saniye/gün olarak ayarlanıyor\n"
-#: hwclock/hwclock.c:801
+#: hwclock/hwclock.c:854
#, c-format
msgid "Time since last adjustment is %d seconds\n"
msgstr "Son ayarlamadan beri %d saniye geçti\n"
-#: hwclock/hwclock.c:803
+#: hwclock/hwclock.c:856
#, c-format
msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
msgstr "%d saniye girmek gerekli ve zaman %.6f saniye öncesine ait\n"
-#: hwclock/hwclock.c:832
+#: hwclock/hwclock.c:885
msgid "Not updating adjtime file because of testing mode.\n"
msgstr "adjtime dosyası test kipinde olunduğundan güncellenmiyor.\n"
-#: hwclock/hwclock.c:833
+#: hwclock/hwclock.c:886
#, c-format
msgid ""
"Would have written the following to %s:\n"
@@ -5252,33 +5482,33 @@ msgstr ""
"Aşağıdaki %s e yazılmalı:\n"
"%s"
-#: hwclock/hwclock.c:857
+#: hwclock/hwclock.c:910
msgid "Drift adjustment parameters not updated.\n"
msgstr "Sapma ayar parametreleri güncellenmedi.\n"
-#: hwclock/hwclock.c:898
+#: hwclock/hwclock.c:951
msgid ""
"The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
msgstr "Donanım saati geçerli bir zaman içermediğinden ayarlanamıyor.\n"
-#: hwclock/hwclock.c:922
+#: hwclock/hwclock.c:983
msgid "Needed adjustment is less than one second, so not setting clock.\n"
msgstr "Gereken ayar bir saniyenin altında olduğundan saat ayarlanmıyor.\n"
-#: hwclock/hwclock.c:948
+#: hwclock/hwclock.c:1009
#, c-format
msgid "Using %s.\n"
msgstr "%s kullanarak.\n"
-#: hwclock/hwclock.c:950
+#: hwclock/hwclock.c:1011
msgid "No usable clock interface found.\n"
msgstr "Kullanılabilir bir saat arayüzü yok.\n"
-#: hwclock/hwclock.c:1045
+#: hwclock/hwclock.c:1107
msgid "Unable to set system clock.\n"
msgstr "Sistem saati ayarlanamıyor.\n"
-#: hwclock/hwclock.c:1076
+#: hwclock/hwclock.c:1137
msgid ""
"The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
"machine.\n"
@@ -5289,16 +5519,16 @@ msgstr ""
"deÄŸeri saklar.\n"
"hwclock'un bu kopyası bir Alpha için derlenmemiş. Bir şey yapılmadı.\n"
-#: hwclock/hwclock.c:1085
+#: hwclock/hwclock.c:1146
msgid "Unable to get the epoch value from the kernel.\n"
msgstr "Çekirdekten dönemsellik değeri alınamıyor.\n"
-#: hwclock/hwclock.c:1087
+#: hwclock/hwclock.c:1148
#, c-format
msgid "Kernel is assuming an epoch value of %lu\n"
msgstr "Çekirdek dönemsellik değerini %lu varsayıyor\n"
-#: hwclock/hwclock.c:1090
+#: hwclock/hwclock.c:1151
msgid ""
"To set the epoch value, you must use the 'epoch' option to tell to what "
"value to set it.\n"
@@ -5306,16 +5536,16 @@ msgstr ""
"Dönemsellik değerinin ayarlanabilmesi için, ayarlanacak değeri 'epoch' "
"seçeneği ile vermelisiniz.\n"
-#: hwclock/hwclock.c:1093
+#: hwclock/hwclock.c:1154
#, c-format
msgid "Not setting the epoch to %d - testing only.\n"
msgstr "Dönemsellik %d olarak ayarlanmayacak - sadece test ediliyor.\n"
-#: hwclock/hwclock.c:1096
+#: hwclock/hwclock.c:1157
msgid "Unable to set the epoch value in the kernel.\n"
msgstr "Çekirdekte dönemsellik değeri ayarlanamıyor.\n"
-#: hwclock/hwclock.c:1125
+#: hwclock/hwclock.c:1191
#, c-format
msgid ""
"hwclock - query and set the hardware clock (RTC)\n"
@@ -5374,7 +5604,7 @@ msgstr ""
" --noadjfile /etc/adjtime okunmaz. Ya --utc ya da --localtime kullanmak\n"
" gerekir.\n"
-#: hwclock/hwclock.c:1152
+#: hwclock/hwclock.c:1218
msgid ""
" --jensen, --arc, --srm, --funky-toy\n"
" tell hwclock the type of alpha you have (see hwclock(8))\n"
@@ -5383,20 +5613,21 @@ msgstr ""
" Alpha'nızın hwclock türü belirtilir\n"
" (hwclock(8) man sayfasına bakınız)\n"
-#: hwclock/hwclock.c:1257
+#: hwclock/hwclock.c:1392
#, c-format
msgid "%s takes no non-option arguments. You supplied %d.\n"
msgstr "%s seçeneği argüman almaz. %d verildi.\n"
-#: hwclock/hwclock.c:1267
+#: hwclock/hwclock.c:1398
+#, fuzzy
msgid ""
-"You have specified multiple function options.\n"
+"You have specified multiple functions.\n"
"You can only perform one function at a time.\n"
msgstr ""
"Çok sayıda işlev belirttiniz.\n"
"Bir defada sadece bir iÅŸlev uygulanabilir.\n"
-#: hwclock/hwclock.c:1273
+#: hwclock/hwclock.c:1405
#, c-format
msgid ""
"%s: The --utc and --localtime options are mutually exclusive. You specified "
@@ -5405,7 +5636,7 @@ msgstr ""
"%s: --utc ve --localtime seçenekleri birbiriyle çelişiyor. İkisi de "
"belirtilmiÅŸ.\n"
-#: hwclock/hwclock.c:1279
+#: hwclock/hwclock.c:1412
#, c-format
msgid ""
"%s: The --adjust and --noadjfile options are mutually exclusive. You "
@@ -5414,24 +5645,24 @@ msgstr ""
"%s: --adjust ve --noadjfile seçenekleri birbiriyle çelişir.\n"
"Siz ikisini de belirtmiÅŸsiniz.\n"
-#: hwclock/hwclock.c:1285
+#: hwclock/hwclock.c:1419
#, c-format
msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
msgstr "%s: --noadjfile ile ya --utc ya da --localtime belirtilmelidir\n"
-#: hwclock/hwclock.c:1298
+#: hwclock/hwclock.c:1433
msgid "No usable set-to time. Cannot set clock.\n"
msgstr "Zaman ayarlama kullanımdışı. Saat ayarlanamaz.\n"
-#: hwclock/hwclock.c:1313
+#: hwclock/hwclock.c:1449
msgid "Sorry, only the superuser can change the Hardware Clock.\n"
msgstr "Donanım saati sadece root tarafından değiştirilebilir.\n"
-#: hwclock/hwclock.c:1317
+#: hwclock/hwclock.c:1454
msgid "Sorry, only the superuser can change the System Clock.\n"
msgstr "Sistem saati sadece root tarafından değiştirilebilir.\n"
-#: hwclock/hwclock.c:1321
+#: hwclock/hwclock.c:1459
msgid ""
"Sorry, only the superuser can change the Hardware Clock epoch in the "
"kernel.\n"
@@ -5439,11 +5670,11 @@ msgstr ""
"Çekirdekteki Donanım Saati dönemsellik değeri sadece root tarafından "
"deÄŸiÅŸtirilebilir.\n"
-#: hwclock/hwclock.c:1341
+#: hwclock/hwclock.c:1479
msgid "Cannot access the Hardware Clock via any known method.\n"
msgstr "Bilinen her hangi bir yöntemle Donanım Saatine erişilemiyor.\n"
-#: hwclock/hwclock.c:1344
+#: hwclock/hwclock.c:1483
msgid ""
"Use the --debug option to see the details of our search for an access "
"method.\n"
@@ -5451,95 +5682,90 @@ msgstr ""
"Bir erişim yöntemi için arama ayrıntılarını görmek için --debug seçeneğini "
"kullanın.\n"
-#: hwclock/kd.c:42
+#: hwclock/kd.c:43
msgid "Waiting in loop for time from KDGHWCLK to change\n"
msgstr "KDGHWCLK zaman değiştirilmek üzere çevrim içinde bekleniyor.\n"
-#: hwclock/kd.c:45
+#: hwclock/kd.c:46
msgid "KDGHWCLK ioctl to read time failed"
msgstr "KDGHWCLK ioctl zamanı okumada başarısız"
-#: hwclock/kd.c:66 hwclock/rtc.c:174
+#: hwclock/kd.c:67 hwclock/rtc.c:187
msgid "Timed out waiting for time change.\n"
msgstr "Zamanı değiştirmek için zamanaşımı bekleniyor.\n"
-#: hwclock/kd.c:70
+#: hwclock/kd.c:71
msgid "KDGHWCLK ioctl to read time failed in loop"
msgstr "KDGHWCLK ioctl çevrim içinde zamanı okumada başarısız"
-#: hwclock/kd.c:92
+#: hwclock/kd.c:93
#, c-format
msgid "ioctl() failed to read time from %s"
msgstr "ioctl() %s den zamanı okuyamadı"
-#: hwclock/kd.c:128
+#: hwclock/kd.c:129
msgid "ioctl KDSHWCLK failed"
msgstr "ioctl KDSHWCLK başarısız"
-#: hwclock/kd.c:165
+#: hwclock/kd.c:166
msgid "Can't open /dev/tty1 or /dev/vc/1"
msgstr "/dev/tty1 veya /dev/vc/1 açılamıyor"
-#: hwclock/kd.c:170
+#: hwclock/kd.c:171
msgid "KDGHWCLK ioctl failed"
msgstr "KDGHWCLK ioctl başarısız"
-#: hwclock/rtc.c:136
+#: hwclock/rtc.c:115 hwclock/rtc.c:208
+#, c-format
+msgid "open() of %s failed"
+msgstr "%s için open() işlevi hata verdi"
+
+#: hwclock/rtc.c:149
#, c-format
msgid "ioctl() to %s to read the time failed.\n"
msgstr "ioctl() %s den zaman okumada başarısız\n"
-#: hwclock/rtc.c:158
+#: hwclock/rtc.c:171
#, c-format
msgid "Waiting in loop for time from %s to change\n"
msgstr "%s den zamanı değiştirmek için çevrim içinde bekleniyor\n"
-#: hwclock/rtc.c:195 hwclock/rtc.c:250
-#, c-format
-msgid "open() of %s failed"
-msgstr "%s için open() işlevi hata verdi"
-
-#: hwclock/rtc.c:213
+#: hwclock/rtc.c:226
#, c-format
msgid "%s does not have interrupt functions. "
msgstr "%s için kesme işlevleri yok."
-#: hwclock/rtc.c:222
+#: hwclock/rtc.c:235
#, c-format
msgid "read() to %s to wait for clock tick failed"
msgstr "read() %s den saat darbesi beklerken hata verdi"
-#: hwclock/rtc.c:231
+#: hwclock/rtc.c:244
#, c-format
msgid "ioctl() to %s to turn off update interrupts failed"
msgstr "ioctl() %s den güncelleme kesmelerini durduramadı"
-#: hwclock/rtc.c:234
+#: hwclock/rtc.c:247
#, c-format
msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
msgstr "ioctl() %s den güncelleme kesmelerini açması gerekirken hata verdi"
-#: hwclock/rtc.c:274 hwclock/rtc.c:358 hwclock/rtc.c:404
-#, c-format
-msgid "Unable to open %s"
-msgstr "%s açılamıyor"
-
-#: hwclock/rtc.c:300
+#: hwclock/rtc.c:306
#, c-format
msgid "ioctl() to %s to set the time failed.\n"
msgstr "ioctl() %s den zamanı ayarlayamadı.\n"
-#: hwclock/rtc.c:306
+#: hwclock/rtc.c:312
#, c-format
msgid "ioctl(%s) was successful.\n"
msgstr "ioctl(%s) başarıldı.\n"
-#: hwclock/rtc.c:335
+#: hwclock/rtc.c:341
#, c-format
msgid "Open of %s failed"
msgstr "%s açılamadı"
-#: hwclock/rtc.c:353 hwclock/rtc.c:399
+#: hwclock/rtc.c:359 hwclock/rtc.c:405
#, c-format
msgid ""
"To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
@@ -5550,12 +5776,17 @@ msgstr ""
"üzerinden Linux 'rtc' aygıt sürücüsüne erişilmelidir. Bu dosya sistemde "
"yok.\n"
-#: hwclock/rtc.c:365
+#: hwclock/rtc.c:364 hwclock/rtc.c:410
+#, c-format
+msgid "Unable to open %s"
+msgstr "%s açılamıyor"
+
+#: hwclock/rtc.c:371
#, c-format
msgid "ioctl(RTC_EPOCH_READ) to %s failed"
msgstr "ioctl(RTC_EPOCH_READ) %s için başarısız"
-#: hwclock/rtc.c:371
+#: hwclock/rtc.c:377
#, c-format
msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
msgstr "RTC_EPOCH_READ ioctl ile dönemsellik %ld %s den okunabilir.\n"
@@ -5563,58 +5794,28 @@ msgstr "RTC_EPOCH_READ ioctl ile dönemsellik %ld %s den okunabilir.\n"
#. kernel would not accept this epoch value
#. Hmm - bad habit, deciding not to do what the user asks
#. just because one believes that the kernel might not like it.
-#: hwclock/rtc.c:391
+#: hwclock/rtc.c:397
#, c-format
msgid "The epoch value may not be less than 1900. You requested %ld\n"
msgstr ""
"Dönemsellik değerinin başlangıcı 1900 yılından önce olamaz. %ld istendi.\n"
-#: hwclock/rtc.c:409
+#: hwclock/rtc.c:415
#, c-format
msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
msgstr "RTC_EPOCH_SET ioctl ile dönemsellik %ld %s den ayarlanıyor.\n"
-#: hwclock/rtc.c:414
+#: hwclock/rtc.c:420
#, c-format
msgid ""
"The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
msgstr "%s için çekirdek aygıt sürücüsünde RTC_EPOCH_SET ioctl yok.\n"
-#: hwclock/rtc.c:417
+#: hwclock/rtc.c:423
#, c-format
msgid "ioctl(RTC_EPOCH_SET) to %s failed"
msgstr "ioctl(RTC_EPOCH_SET) %s için hata verdi"
-#: hwclock/shhopt.c:255 hwclock/shhopt.c:281
-#, c-format
-msgid "invalid number `%s'\n"
-msgstr "`%s' geçersiz sayı\n"
-
-#: hwclock/shhopt.c:258 hwclock/shhopt.c:284
-#, c-format
-msgid "number `%s' to `%s' out of range\n"
-msgstr "`%s' `%s' aralığının dışında\n"
-
-#: hwclock/shhopt.c:398
-#, c-format
-msgid "unrecognized option `%s'\n"
-msgstr "`%s' seçeneği bilinmiyor\n"
-
-#: hwclock/shhopt.c:411 hwclock/shhopt.c:449
-#, c-format
-msgid "option `%s' requires an argument\n"
-msgstr "`%s' seçeneği bir argümanla kullanılır\n"
-
-#: hwclock/shhopt.c:417
-#, c-format
-msgid "option `%s' doesn't allow an argument\n"
-msgstr "`%s' seçeneği bir argümansız kullanılır\n"
-
-#: hwclock/shhopt.c:439
-#, c-format
-msgid "unrecognized option `-%c'\n"
-msgstr "`-%c' seçeneği bilinmiyor\n"
-
#: login-utils/agetty.c:312
msgid "calling open_tty\n"
msgstr "open_tty çağrılıyor\n"
@@ -6650,7 +6851,7 @@ msgstr "dizine geçilemedi\n"
msgid "fork failed\n"
msgstr "ast süreç oluşturulamadı\n"
-#: login-utils/simpleinit.c:512 text-utils/more.c:1705
+#: login-utils/simpleinit.c:512 text-utils/more.c:1706
msgid "exec failed\n"
msgstr "çalıştırma başarısız\n"
@@ -7436,159 +7637,159 @@ msgstr "[mntent]: %d satırı %s dosyasında hatalı%s\n"
msgid "; rest of file ignored"
msgstr "; dosyanın kalanı yoksayıldı"
-#: mount/mount.c:379
+#: mount/mount.c:381
#, c-format
msgid "mount: according to mtab, %s is already mounted on %s"
msgstr "mount: mtab'a göre, %s zaten %s üzerinde bağlı"
-#: mount/mount.c:383
+#: mount/mount.c:385
#, c-format
msgid "mount: according to mtab, %s is mounted on %s"
msgstr "mount: mtab'a göre, %s %s üzerinde bağlı"
-#: mount/mount.c:404
+#: mount/mount.c:406
#, c-format
msgid "mount: can't open %s for writing: %s"
msgstr "mount: %s yazmak için açılamıyor: %s"
-#: mount/mount.c:419 mount/mount.c:638
+#: mount/mount.c:421 mount/mount.c:640
#, c-format
msgid "mount: error writing %s: %s"
msgstr "mount: %s yazılırken hata: %s"
-#: mount/mount.c:426
+#: mount/mount.c:428
#, c-format
msgid "mount: error changing mode of %s: %s"
msgstr "mount: %s kipi deÄŸiÅŸtirilirken hata: %s"
-#: mount/mount.c:472
+#: mount/mount.c:474
#, c-format
msgid "%s looks like swapspace - not mounted"
msgstr "%s takas alanı gibi görünüyor - bağlanmadı"
-#: mount/mount.c:532
+#: mount/mount.c:534
msgid "mount failed"
msgstr "mount başarısız"
-#: mount/mount.c:534
+#: mount/mount.c:536
#, c-format
msgid "mount: only root can mount %s on %s"
msgstr "mount: %s %s üzerinde sadece root tarafından bağlanabilir"
-#: mount/mount.c:562
+#: mount/mount.c:564
msgid "mount: loop device specified twice"
msgstr "mount: loop aygıtı iki kere belirtilmiş"
-#: mount/mount.c:567
+#: mount/mount.c:569
msgid "mount: type specified twice"
msgstr "mount: türü iki defa belirtilmiş"
-#: mount/mount.c:579
+#: mount/mount.c:581
msgid "mount: skipping the setup of a loop device\n"
msgstr "mount: loop aygıtı ayarları atlanıyor\n"
-#: mount/mount.c:588
+#: mount/mount.c:590
#, c-format
msgid "mount: going to use the loop device %s\n"
msgstr "mount: %s loop aygıtının kullanımına gidiliyor\n"
-#: mount/mount.c:592
+#: mount/mount.c:594
msgid "mount: failed setting up loop device\n"
msgstr "mount: loop aygıtı ayarları yapılamadı\n"
-#: mount/mount.c:596
+#: mount/mount.c:598
msgid "mount: setup loop device successfully\n"
msgstr "mount: loop aygıtı ayarları tamamlandı\n"
-#: mount/mount.c:633
+#: mount/mount.c:635
#, c-format
msgid "mount: can't open %s: %s"
msgstr "mount: %s açılamıyor: %s"
-#: mount/mount.c:656
+#: mount/mount.c:658
#, c-format
msgid "mount: cannot open %s for setting speed"
msgstr "mount: hızı ayarlamak için %s açılamıyor"
-#: mount/mount.c:659
+#: mount/mount.c:661
#, c-format
msgid "mount: cannot set speed: %s"
msgstr "mount: hız ayarlanamıyor: %s"
-#: mount/mount.c:720 mount/mount.c:1265
+#: mount/mount.c:722 mount/mount.c:1295
#, c-format
msgid "mount: cannot fork: %s"
msgstr "mount: ast süreç oluşturulamıyor: %s"
-#: mount/mount.c:800
+#: mount/mount.c:802
msgid "mount: this version was compiled without support for the type `nfs'"
msgstr "mount: bu sürüm `nfs' türü için destek olmaksızın derlenmiş"
-#: mount/mount.c:839
+#: mount/mount.c:841
msgid "mount: failed with nfs mount version 4, trying 3..\n"
msgstr "mount: nfs mount sürüm 4 ile başarısız, 3 deneniyor...\n"
-#: mount/mount.c:850
+#: mount/mount.c:852
msgid ""
"mount: I could not determine the filesystem type, and none was specified"
msgstr "mount: Dosya sistemi türü saptanamadı ve belirtilmemiş"
-#: mount/mount.c:853
+#: mount/mount.c:855
msgid "mount: you must specify the filesystem type"
msgstr "mount: dosya sistemi türünü belirtmelisiniz"
#. should not happen
-#: mount/mount.c:856
+#: mount/mount.c:858
msgid "mount: mount failed"
msgstr "mount: bağlanamadı"
-#: mount/mount.c:862 mount/mount.c:897
+#: mount/mount.c:864 mount/mount.c:899
#, c-format
msgid "mount: mount point %s is not a directory"
msgstr "mount: bağlama noktası %s bir dizin değil"
-#: mount/mount.c:864
+#: mount/mount.c:866
msgid "mount: permission denied"
msgstr "mount: eriÅŸim engellendi"
-#: mount/mount.c:866
+#: mount/mount.c:868
msgid "mount: must be superuser to use mount"
msgstr "mount: root tarafından kullanılmalı"
#. heuristic: if /proc/version exists, then probably proc is mounted
#. proc mounted?
-#: mount/mount.c:870 mount/mount.c:874
+#: mount/mount.c:872 mount/mount.c:876
#, c-format
msgid "mount: %s is busy"
msgstr "mount: %s meÅŸgul"
#. no
#. yes, don't mention it
-#: mount/mount.c:876
+#: mount/mount.c:878
msgid "mount: proc already mounted"
msgstr "mount: proc zaten bağlı"
-#: mount/mount.c:878
+#: mount/mount.c:880
#, c-format
msgid "mount: %s already mounted or %s busy"
msgstr "mount: ya %s zaten bağlı ya da %s meşgul"
-#: mount/mount.c:884
+#: mount/mount.c:886
#, c-format
msgid "mount: mount point %s does not exist"
msgstr "mount: bağlama noktası %s yok"
-#: mount/mount.c:886
+#: mount/mount.c:888
#, c-format
msgid "mount: mount point %s is a symbolic link to nowhere"
msgstr "mount: bağlama noktası %s hiçbir yere sembolik bağ sağlamıyor"
-#: mount/mount.c:889
+#: mount/mount.c:891
#, c-format
msgid "mount: special device %s does not exist"
msgstr "mount: özel aygıt %s yok"
-#: mount/mount.c:899
+#: mount/mount.c:901
#, c-format
msgid ""
"mount: special device %s does not exist\n"
@@ -7597,12 +7798,12 @@ msgstr ""
"mount: özel aygıt %s yok\n"
" (dosya yolu öneki bir dizin değil)\n"
-#: mount/mount.c:912
+#: mount/mount.c:914
#, c-format
msgid "mount: %s not mounted already, or bad option"
msgstr "mount: %s zaten bağlı değil, ya da seçenek yanlış"
-#: mount/mount.c:914
+#: mount/mount.c:916
#, c-format
msgid ""
"mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -7611,35 +7812,35 @@ msgstr ""
"mount: dosya sistemi türü yanlış, seçenek yanlış, %s üzerinde superblok\n"
" hatalı ya da çok sayıda bağlı dosya sistemi olabilir"
-#: mount/mount.c:948
+#: mount/mount.c:950
msgid "mount table full"
msgstr "baÄŸ tablosu dolu"
-#: mount/mount.c:950
+#: mount/mount.c:952
#, c-format
msgid "mount: %s: can't read superblock"
msgstr "mount: %s: superblok okunamıyor"
-#: mount/mount.c:954
+#: mount/mount.c:956
#, c-format
msgid "mount: %s: unknown device"
msgstr "mount: %s: aygıt bilinmiyor"
-#: mount/mount.c:959
+#: mount/mount.c:961
#, c-format
msgid "mount: fs type %s not supported by kernel"
msgstr "mount: dosya sistemi türü %s çekirdek tarafından desteklenmiyor"
-#: mount/mount.c:971
+#: mount/mount.c:973
#, c-format
msgid "mount: probably you meant %s"
msgstr "mount: herhalde %s kastettiniz"
-#: mount/mount.c:973
+#: mount/mount.c:975
msgid "mount: maybe you meant iso9660 ?"
msgstr "mount: iso9660 kastetmiÅŸ olabilir misiniz?"
-#: mount/mount.c:976
+#: mount/mount.c:978
#, c-format
msgid "mount: %s has wrong device number or fs type %s not supported"
msgstr ""
@@ -7647,14 +7848,14 @@ msgstr ""
"desteklenmiyor"
#. strange ...
-#: mount/mount.c:982
+#: mount/mount.c:984
#, c-format
msgid "mount: %s is not a block device, and stat fails?"
msgstr ""
"mount: %s bir blok aygıtı olmayabilir mi ve durum bilgileri alınamayabilir "
"mi?"
-#: mount/mount.c:984
+#: mount/mount.c:986
#, c-format
msgid ""
"mount: the kernel does not recognize %s as a block device\n"
@@ -7663,93 +7864,98 @@ msgstr ""
"mount: çekirdek %s aygıtını bir blok aygıtı olarak tanımıyor\n"
" (`insmod sürücü' denenebilir?)"
-#: mount/mount.c:987
+#: mount/mount.c:989
#, c-format
msgid "mount: %s is not a block device (maybe try `-o loop'?)"
msgstr "mount: %s bir blok aygıtı değil ( `-o loop' denenebilir mi?)"
-#: mount/mount.c:990
+#: mount/mount.c:992
#, c-format
msgid "mount: %s is not a block device"
msgstr "mount: %s bir blok aygıtı değil"
-#: mount/mount.c:993
+#: mount/mount.c:995
#, c-format
msgid "mount: %s is not a valid block device"
msgstr "mount: %s geçerli bir blok aygıtı değil"
#. pre-linux 1.1.38, 1.1.41 and later
#. linux 1.1.38 and later
-#: mount/mount.c:996
+#: mount/mount.c:998
msgid "block device "
msgstr "blok aygıtı "
-#: mount/mount.c:998
+#: mount/mount.c:1000
#, c-format
msgid "mount: cannot mount %s%s read-only"
msgstr "mount: %s%s salt-okunur bağlanamıyor"
-#: mount/mount.c:1002
+#: mount/mount.c:1004
#, c-format
msgid "mount: %s%s is write-protected but explicit `-w' flag given"
msgstr ""
"mount: %s%s yazma korumalı olduğu halde alenen `-w' seçeneği belirtilmiş"
-#: mount/mount.c:1018
+#: mount/mount.c:1020
#, c-format
msgid "mount: %s%s is write-protected, mounting read-only"
msgstr "mount: %s%s yazma korumalı, salt-okunur olarak bağlanıyor"
-#: mount/mount.c:1104
+#: mount/mount.c:1107
#, c-format
msgid "mount: the label %s occurs on both %s and %s\n"
msgstr "mount: etiket %s hem %s hem de %s için görünüyor\n"
-#: mount/mount.c:1108
+#: mount/mount.c:1111
#, c-format
msgid "mount: %s duplicate - not mounted"
msgstr "mount: %s yinelendi - bağlanmadı"
-#: mount/mount.c:1118
+#: mount/mount.c:1121
#, c-format
msgid "mount: going to mount %s by %s\n"
msgstr "mount: %s %s tarafından bağlanıyor\n"
-#: mount/mount.c:1119
+#: mount/mount.c:1122
msgid "UUID"
msgstr "UUID"
-#: mount/mount.c:1119
+#: mount/mount.c:1122
msgid "label"
msgstr "yafta"
-#: mount/mount.c:1121 mount/mount.c:1521
+#: mount/mount.c:1124 mount/mount.c:1555
msgid "mount: no such partition found"
msgstr "mount: böyle bir disk bölümü yok"
-#: mount/mount.c:1129
+#: mount/mount.c:1132
msgid "mount: no type was given - I'll assume nfs because of the colon\n"
msgstr "mount: tür belirtilmemiş - ':' içerdiğinden nfs varsayılıyor\n"
+#: mount/mount.c:1137
+#, fuzzy
+msgid "mount: no type was given - I'll assume smb because of the // prefix\n"
+msgstr "mount: tür belirtilmemiş - ':' içerdiğinden nfs varsayılıyor\n"
+
#.
#. * Retry in the background.
#.
-#: mount/mount.c:1145
+#: mount/mount.c:1153
#, c-format
msgid "mount: backgrounding \"%s\"\n"
msgstr "mount: \"%s\" artalana alınıyor\n"
-#: mount/mount.c:1156
+#: mount/mount.c:1164
#, c-format
msgid "mount: giving up \"%s\"\n"
msgstr "mount: \"%s\" bırakılıyor\n"
-#: mount/mount.c:1216
+#: mount/mount.c:1240
#, c-format
msgid "mount: %s already mounted on %s\n"
msgstr "mount: %s zaten %s üzerinde bağlı\n"
-#: mount/mount.c:1335
+#: mount/mount.c:1369
msgid ""
"Usage: mount -V : print version\n"
" mount -h : print this help\n"
@@ -7797,73 +8003,73 @@ msgstr ""
"Çeviri hatalarını <gnu-tr-u12a@lists.sourceforge.net> adresine bildiriniz.\n"
"Daha fazla bilgi edinmek için 'man 8 mount' yazabilirsiniz.\n"
-#: mount/mount.c:1497
+#: mount/mount.c:1531
msgid "mount: only root can do that"
msgstr "mount: bunu sadece root yapabilir"
-#: mount/mount.c:1502
+#: mount/mount.c:1536
#, c-format
msgid "mount: no %s found - creating it..\n"
msgstr "mount: %s yok - oluÅŸturuluyor...\n"
-#: mount/mount.c:1516
+#: mount/mount.c:1550
#, c-format
msgid "mount: the label %s occurs on both %s and %s - not mounted\n"
msgstr "mount: etiket %s hem %s hem de %s için görünüyor - bağlanmadı\n"
-#: mount/mount.c:1523
+#: mount/mount.c:1557
#, c-format
msgid "mount: mounting %s\n"
msgstr "mount: %s bağlanıyor\n"
-#: mount/mount.c:1532
+#: mount/mount.c:1566
msgid "nothing was mounted"
msgstr "hiçbir şey bağlanmadı"
-#: mount/mount.c:1547
+#: mount/mount.c:1581
#, c-format
msgid "mount: cannot find %s in %s"
msgstr "mount: %s %s içinde bulunamıyor"
-#: mount/mount.c:1562
+#: mount/mount.c:1596
#, c-format
msgid "mount: can't find %s in %s or %s"
msgstr "mount: %s %s ya da %s içinde bulunamıyor"
-#: mount/mount_by_label.c:169
+#: mount/mount_by_label.c:199
#, c-format
msgid ""
"mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
msgstr "mount: %s açılamadı, UUID ve ETİKET dönüşümü yapılmış olmayabilir.\n"
-#: mount/mount_by_label.c:295
+#: mount/mount_by_label.c:325
msgid "mount: bad UUID"
msgstr "mount: UUID hatalı"
-#: mount/mount_guess_fstype.c:487
+#: mount/mount_guess_fstype.c:482
msgid "mount: error while guessing filesystem type\n"
msgstr "mount: dosya sistemi türü belirlenirken hata\n"
-#: mount/mount_guess_fstype.c:496
+#: mount/mount_guess_fstype.c:491
#, c-format
msgid "mount: you didn't specify a filesystem type for %s\n"
msgstr "mount: %s için bir dosya sistemi türü belirtilmemiş\n"
-#: mount/mount_guess_fstype.c:499
+#: mount/mount_guess_fstype.c:494
#, c-format
msgid " I will try all types mentioned in %s or %s\n"
msgstr " %s ya da %s içindeki anılan tüm türler denenecek\n"
-#: mount/mount_guess_fstype.c:502
+#: mount/mount_guess_fstype.c:497
msgid " and it looks like this is swapspace\n"
msgstr " ve bu takas alanı gibi görünüyor\n"
-#: mount/mount_guess_fstype.c:504
+#: mount/mount_guess_fstype.c:499
#, c-format
msgid " I will try type %s\n"
msgstr " %s türü denenecek\n"
-#: mount/mount_guess_fstype.c:592
+#: mount/mount_guess_fstype.c:587
#, c-format
msgid "Trying %s\n"
msgstr "%s deneniyor\n"
@@ -7957,7 +8163,7 @@ msgstr "bilinmeyen nfs durum sonuç değeri: %d"
msgid "bug in xstrndup call"
msgstr "xstrndup çağrısında yazılım hatası"
-#: mount/swapon.c:51
+#: mount/swapon.c:56
#, c-format
msgid ""
"usage: %s [-hV]\n"
@@ -7970,27 +8176,43 @@ msgstr ""
" %s [-v] [-p öncelik] özel ...\n"
" %s [-s]\n"
-#: mount/swapon.c:88
+#: mount/swapon.c:66
+#, fuzzy, c-format
+msgid ""
+"usage: %s [-hV]\n"
+" %s -a [-v]\n"
+" %s [-v] special ...\n"
+msgstr ""
+"kullanımı: %s [-hV]\n"
+" %s -a [-v]\n"
+" %s [-v] [-p öncelik] özel ...\n"
+" %s [-s]\n"
+
+#: mount/swapon.c:170 mount/swapon.c:234
#, c-format
msgid "%s on %s\n"
msgstr "%s %s üzerinde\n"
-#: mount/swapon.c:93
+#: mount/swapon.c:174
#, c-format
msgid "swapon: cannot stat %s: %s\n"
msgstr "swapon: %s durum bilgileri alınamıyor: %s\n"
-#: mount/swapon.c:105
+#: mount/swapon.c:185
#, c-format
msgid "swapon: warning: %s has insecure permissions %04o, %04o suggested\n"
msgstr "swapon: uyarı: %s güvencesiz izinler (%04o) içeriyor, %04o önerilir\n"
-#: mount/swapon.c:115
+#: mount/swapon.c:197
#, c-format
msgid "swapon: Skipping file %s - it appears to have holes.\n"
msgstr "swapon: %s atlanıyor - delikler içeriyor gibi görünüyor.\n"
-#: mount/swapon.c:222
+#: mount/swapon.c:240
+msgid "Not superuser.\n"
+msgstr ""
+
+#: mount/swapon.c:298 mount/swapon.c:386
#, c-format
msgid "%s: cannot open %s: %s\n"
msgstr "%s: %s açılamıyor: %s\n"
@@ -8377,28 +8599,28 @@ msgstr "%s: %s (%s)\n"
msgid "%s: unknown argument: %s\n"
msgstr "%s: bilinmeyen argüman: %s\n"
-#: sys-utils/ipcs.c:122
+#: sys-utils/ipcs.c:121
#, c-format
msgid "usage : %s -asmq -tclup \n"
msgstr "kullanımı: %s -asmq -tclup \n"
-#: sys-utils/ipcs.c:123
+#: sys-utils/ipcs.c:122
#, c-format
msgid "\t%s [-s -m -q] -i id\n"
msgstr " %s [-s -m -q] -i kimlik\n"
-#: sys-utils/ipcs.c:124
+#: sys-utils/ipcs.c:123
#, c-format
msgid "\t%s -h for help.\n"
msgstr " %s -h yardım almak için.\n"
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:129
#, c-format
msgid ""
"%s provides information on ipc facilities for which you have read access.\n"
msgstr "%s okuma erişiminiz olan ipc yetenekleri hakkında bilgi sağlar.\n"
-#: sys-utils/ipcs.c:132
+#: sys-utils/ipcs.c:131
msgid ""
"Resource Specification:\n"
"\t-m : shared_mem\n"
@@ -8408,7 +8630,7 @@ msgstr ""
"\t-m : paylaşımlı bellek\n"
"\t-q : iletiler\n"
-#: sys-utils/ipcs.c:133
+#: sys-utils/ipcs.c:132
msgid ""
"\t-s : semaphores\n"
"\t-a : all (default)\n"
@@ -8416,7 +8638,7 @@ msgstr ""
"\t-s : semaforlar\n"
"\t-a : tümü (öntanımlı)\n"
-#: sys-utils/ipcs.c:134
+#: sys-utils/ipcs.c:133
msgid ""
"Output Format:\n"
"\t-t : time\n"
@@ -8428,7 +8650,7 @@ msgstr ""
"\t-p : pid\n"
"\t-c : oluÅŸturan\n"
-#: sys-utils/ipcs.c:135
+#: sys-utils/ipcs.c:134
msgid ""
"\t-l : limits\n"
"\t-u : summary\n"
@@ -8436,377 +8658,377 @@ msgstr ""
"\t-l : sınırlar\n"
"\t-u : özet\n"
-#: sys-utils/ipcs.c:136
+#: sys-utils/ipcs.c:135
msgid "-i id [-s -q -m] : details on resource identified by id\n"
msgstr ""
"-i kimlik [-s -q -m] : kimlik ile belirtilen özkaynak hakkında bilgi verir\n"
-#: sys-utils/ipcs.c:268
+#: sys-utils/ipcs.c:267
msgid "kernel not configured for shared memory\n"
msgstr "çekirdek paylaşımlı bellek için yapılandırılmamış\n"
-#: sys-utils/ipcs.c:274
+#: sys-utils/ipcs.c:273
msgid "------ Shared Memory Limits --------\n"
msgstr "---- Paylaşımlı Bellek Sınırları ----\n"
#. glibc 2.1.3 and all earlier libc's have ints as fields
#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
-#: sys-utils/ipcs.c:279
+#: sys-utils/ipcs.c:278
#, c-format
msgid "max number of segments = %ld\n"
msgstr "en fazla segman sayısı = %ld\n"
-#: sys-utils/ipcs.c:281
+#: sys-utils/ipcs.c:280
#, c-format
msgid "max seg size (kbytes) = %ld\n"
msgstr "en fazla segman boyu (kb) = %ld\n"
-#: sys-utils/ipcs.c:283
+#: sys-utils/ipcs.c:282
#, c-format
msgid "max total shared memory (kbytes) = %ld\n"
msgstr "en fazla toplam paylaşımlı bellek (kb) = %ld\n"
-#: sys-utils/ipcs.c:285
+#: sys-utils/ipcs.c:284
#, c-format
msgid "min seg size (bytes) = %ld\n"
msgstr "en az segman boyu (bayt) = %ld\n"
-#: sys-utils/ipcs.c:290
+#: sys-utils/ipcs.c:289
msgid "------ Shared Memory Status --------\n"
msgstr "----- Paylaşımlı Bellek Durumu -----\n"
-#: sys-utils/ipcs.c:291
+#: sys-utils/ipcs.c:290
#, c-format
msgid "segments allocated %d\n"
msgstr "ayrılmış segman sayısı %d\n"
-#: sys-utils/ipcs.c:292
+#: sys-utils/ipcs.c:291
#, c-format
msgid "pages allocated %ld\n"
msgstr "ayrılmış sayfa sayısı %ld\n"
-#: sys-utils/ipcs.c:293
+#: sys-utils/ipcs.c:292
#, c-format
msgid "pages resident %ld\n"
msgstr "bulunan sayfa sayısı %ld\n"
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:293
#, c-format
msgid "pages swapped %ld\n"
msgstr "takaslı sayfa sayısı %ld\n"
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:294
#, c-format
msgid "Swap performance: %ld attempts\t %ld successes\n"
msgstr "Takas verimi: %ld deneme\t %ld başarı\n"
-#: sys-utils/ipcs.c:300
+#: sys-utils/ipcs.c:299
msgid "------ Shared Memory Segment Creators/Owners --------\n"
msgstr "--- Paylaşımlı Bellek Segman Oluşturucuları/Kendileri ---\n"
-#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:300 sys-utils/ipcs.c:417 sys-utils/ipcs.c:516
#, c-format
msgid "%-10s %-10s %-10s %-10s %-10s %-10s\n"
msgstr "%-10s %-10s %-10s %-10s %-10s %-10s\n"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:308 sys-utils/ipcs.c:315
-#: sys-utils/ipcs.c:321 sys-utils/ipcs.c:425
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:307 sys-utils/ipcs.c:314
+#: sys-utils/ipcs.c:320 sys-utils/ipcs.c:424
msgid "shmid"
msgstr "shmid"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:321 sys-utils/ipcs.c:419
-#: sys-utils/ipcs.c:434 sys-utils/ipcs.c:519 sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:320 sys-utils/ipcs.c:418
+#: sys-utils/ipcs.c:433 sys-utils/ipcs.c:517 sys-utils/ipcs.c:535
msgid "perms"
msgstr "izinler"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:517
msgid "cuid"
msgstr "ckullkiml"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:517
msgid "cgid"
msgstr "cgkiml"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:517
msgid "uid"
msgstr "kullkim"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:517
msgid "gid"
msgstr "gkiml"
-#: sys-utils/ipcs.c:306
+#: sys-utils/ipcs.c:305
msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
msgstr "---- Paylaşımlı Bellek Ekleme/Ayırma/Değişiklik Zamanları ----\n"
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:306
#, c-format
msgid "%-10s %-10s %-20s %-20s %-20s\n"
msgstr "%-10s %-10s %-20s %-20s %-20s\n"
-#: sys-utils/ipcs.c:308 sys-utils/ipcs.c:315 sys-utils/ipcs.c:321
-#: sys-utils/ipcs.c:425 sys-utils/ipcs.c:434 sys-utils/ipcs.c:525
-#: sys-utils/ipcs.c:531 sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:314 sys-utils/ipcs.c:320
+#: sys-utils/ipcs.c:424 sys-utils/ipcs.c:433 sys-utils/ipcs.c:523
+#: sys-utils/ipcs.c:529 sys-utils/ipcs.c:535
msgid "owner"
msgstr "sahibi"
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:307
msgid "attached"
msgstr "ekleme"
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:307
msgid "detached"
msgstr "ayırma"
-#: sys-utils/ipcs.c:309
+#: sys-utils/ipcs.c:308
msgid "changed"
msgstr "deÄŸiÅŸiklik"
-#: sys-utils/ipcs.c:313
+#: sys-utils/ipcs.c:312
msgid "------ Shared Memory Creator/Last-op --------\n"
msgstr "---- Paylaşımlı Bellek Oluşturucu/Son işlem ----\n"
-#: sys-utils/ipcs.c:314 sys-utils/ipcs.c:530
+#: sys-utils/ipcs.c:313 sys-utils/ipcs.c:528
#, c-format
msgid "%-10s %-10s %-10s %-10s\n"
msgstr "%-10s %-10s %-10s %-10s\n"
-#: sys-utils/ipcs.c:315
+#: sys-utils/ipcs.c:314
msgid "cpid"
msgstr "cpid"
-#: sys-utils/ipcs.c:315
+#: sys-utils/ipcs.c:314
msgid "lpid"
msgstr "lpid"
-#: sys-utils/ipcs.c:319
+#: sys-utils/ipcs.c:318
msgid "------ Shared Memory Segments --------\n"
msgstr "----- Paylaşımlı Bellek Segmanları -----\n"
-#: sys-utils/ipcs.c:320
+#: sys-utils/ipcs.c:319
#, c-format
msgid "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n"
msgstr "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n"
-#: sys-utils/ipcs.c:321 sys-utils/ipcs.c:434 sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:320 sys-utils/ipcs.c:433 sys-utils/ipcs.c:535
msgid "key"
msgstr "anahtar"
-#: sys-utils/ipcs.c:321
+#: sys-utils/ipcs.c:320
msgid "bytes"
msgstr "bayt"
-#: sys-utils/ipcs.c:322
+#: sys-utils/ipcs.c:321
msgid "nattch"
msgstr "ekSayısı"
-#: sys-utils/ipcs.c:322 sys-utils/ipcs.c:435
+#: sys-utils/ipcs.c:321
msgid "status"
msgstr "durum"
-#: sys-utils/ipcs.c:343 sys-utils/ipcs.c:345 sys-utils/ipcs.c:347
-#: sys-utils/ipcs.c:456 sys-utils/ipcs.c:458 sys-utils/ipcs.c:558
-#: sys-utils/ipcs.c:560 sys-utils/ipcs.c:562 sys-utils/ipcs.c:615
-#: sys-utils/ipcs.c:617 sys-utils/ipcs.c:646 sys-utils/ipcs.c:648
-#: sys-utils/ipcs.c:650 sys-utils/ipcs.c:674
+#: sys-utils/ipcs.c:342 sys-utils/ipcs.c:344 sys-utils/ipcs.c:346
+#: sys-utils/ipcs.c:455 sys-utils/ipcs.c:457 sys-utils/ipcs.c:556
+#: sys-utils/ipcs.c:558 sys-utils/ipcs.c:560 sys-utils/ipcs.c:613
+#: sys-utils/ipcs.c:615 sys-utils/ipcs.c:644 sys-utils/ipcs.c:646
+#: sys-utils/ipcs.c:648 sys-utils/ipcs.c:672
msgid "Not set"
msgstr "Belirlenmedi"
-#: sys-utils/ipcs.c:372
+#: sys-utils/ipcs.c:371
msgid "dest"
msgstr "hedef"
-#: sys-utils/ipcs.c:373
+#: sys-utils/ipcs.c:372
msgid "locked"
msgstr "kilitli"
-#: sys-utils/ipcs.c:393
+#: sys-utils/ipcs.c:392
msgid "kernel not configured for semaphores\n"
msgstr "çekirdek semaforlar için yapılandırılmamış\n"
-#: sys-utils/ipcs.c:399
+#: sys-utils/ipcs.c:398
msgid "------ Semaphore Limits --------\n"
msgstr "------ Semafor Sınırları --------\n"
-#: sys-utils/ipcs.c:403
+#: sys-utils/ipcs.c:402
#, c-format
msgid "max number of arrays = %d\n"
msgstr "en fazla dizi sayısı = %d\n"
-#: sys-utils/ipcs.c:404
+#: sys-utils/ipcs.c:403
#, c-format
msgid "max semaphores per array = %d\n"
msgstr "semafor başına en fazla dizi sayısı = %d\n"
-#: sys-utils/ipcs.c:405
+#: sys-utils/ipcs.c:404
#, c-format
msgid "max semaphores system wide = %d\n"
msgstr "tüm sistemdeki en fazla semafor sayısı = %d\n"
-#: sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:405
#, c-format
msgid "max ops per semop call = %d\n"
msgstr "semafor çağrısı başına en fazla işlem sayısı = %d\n"
-#: sys-utils/ipcs.c:407
+#: sys-utils/ipcs.c:406
#, c-format
msgid "semaphore max value = %d\n"
msgstr "semafor en yüksek değeri = %d\n"
-#: sys-utils/ipcs.c:411
+#: sys-utils/ipcs.c:410
msgid "------ Semaphore Status --------\n"
msgstr "------ Semafor Durumu --------\n"
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:411
#, c-format
msgid "used arrays = %d\n"
msgstr "kullanılan dizi sayısı = %d\n"
-#: sys-utils/ipcs.c:413
+#: sys-utils/ipcs.c:412
#, c-format
msgid "allocated semaphores = %d\n"
msgstr "ayrılmış semafor sayısı = %d\n"
-#: sys-utils/ipcs.c:417
+#: sys-utils/ipcs.c:416
msgid "------ Semaphore Arrays Creators/Owners --------\n"
msgstr "------ Semafor Dizileri OluÅŸturucu/Kendi --------\n"
-#: sys-utils/ipcs.c:419 sys-utils/ipcs.c:434
+#: sys-utils/ipcs.c:418 sys-utils/ipcs.c:433
msgid "semid"
msgstr "semkiml"
-#: sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:422
msgid "------ Shared Memory Operation/Change Times --------\n"
msgstr "---- Paylaşımlı Bellek İşlem/Değişiklik Zamanları ----\n"
-#: sys-utils/ipcs.c:424
+#: sys-utils/ipcs.c:423
#, c-format
msgid "%-8s %-10s %-26.24s %-26.24s\n"
msgstr "%-8s %-10s %-26.24s %-26.24s\n"
-#: sys-utils/ipcs.c:425
+#: sys-utils/ipcs.c:424
msgid "last-op"
msgstr "son-iÅŸl"
-#: sys-utils/ipcs.c:425
+#: sys-utils/ipcs.c:424
msgid "last-changed"
msgstr "son-deÄŸÅŸ"
-#: sys-utils/ipcs.c:432
+#: sys-utils/ipcs.c:431
msgid "------ Semaphore Arrays --------\n"
msgstr "------ Semafor Dizileri ------\n"
-#: sys-utils/ipcs.c:433
+#: sys-utils/ipcs.c:432 sys-utils/ipcs.c:675
#, c-format
-msgid "%-10s %-10s %-10s %-10s %-10s %-12s\n"
-msgstr "%-10s %-10s %-10s %-10s %-10s %-12s\n"
+msgid "%-10s %-10s %-10s %-10s %-10s\n"
+msgstr "%-10s %-10s %-10s %-10s %-10s\n"
-#: sys-utils/ipcs.c:435
+#: sys-utils/ipcs.c:434
msgid "nsems"
msgstr "semSayısı"
-#: sys-utils/ipcs.c:495
+#: sys-utils/ipcs.c:493
msgid "kernel not configured for message queues\n"
msgstr "çekirdek ileti kuyrukları için yapılandırılmamış\n"
-#: sys-utils/ipcs.c:503
+#: sys-utils/ipcs.c:501
msgid "------ Messages: Limits --------\n"
msgstr "------ İletiler: Sınırlar --------\n"
-#: sys-utils/ipcs.c:504
+#: sys-utils/ipcs.c:502
#, c-format
msgid "max queues system wide = %d\n"
msgstr "tüm sistemdeki en fazla kuyruk sayısı = %d\n"
-#: sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:503
#, c-format
msgid "max size of message (bytes) = %d\n"
msgstr "en fazla ileti uzunluÄŸu (bayt) = %d\n"
-#: sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:504
#, c-format
msgid "default max size of queue (bytes) = %d\n"
msgstr "öntanımlı en fazla kuyruk boyu (bayt) = %d\n"
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:508
msgid "------ Messages: Status --------\n"
msgstr "------ Ä°letiler: Durum --------\n"
-#: sys-utils/ipcs.c:511
+#: sys-utils/ipcs.c:509
#, c-format
msgid "allocated queues = %d\n"
msgstr "ayrılmış kuyruk sayısı = %d\n"
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:510
#, c-format
msgid "used headers = %d\n"
msgstr "kullanılmış başlık sayısı = %d\n"
-#: sys-utils/ipcs.c:513
+#: sys-utils/ipcs.c:511
#, c-format
msgid "used space = %d bytes\n"
msgstr "kullanılmış alan = %d bayt\n"
-#: sys-utils/ipcs.c:517
+#: sys-utils/ipcs.c:515
msgid "------ Message Queues: Creators/Owners --------\n"
msgstr "------ İleti Kuyrukları: Oluşturucu/Kendi --------\n"
-#: sys-utils/ipcs.c:519 sys-utils/ipcs.c:525 sys-utils/ipcs.c:531
-#: sys-utils/ipcs.c:537
+#: sys-utils/ipcs.c:517 sys-utils/ipcs.c:523 sys-utils/ipcs.c:529
+#: sys-utils/ipcs.c:535
msgid "msqid"
msgstr "iltkiml"
-#: sys-utils/ipcs.c:523
+#: sys-utils/ipcs.c:521
msgid "------ Message Queues Send/Recv/Change Times --------\n"
msgstr "------ İleti Kuyrukları Gönd/Alım/Değiş. Zamanları --------\n"
-#: sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:522
#, c-format
msgid "%-8s %-10s %-20s %-20s %-20s\n"
msgstr "%-8s %-10s %-20s %-20s %-20s\n"
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:523
msgid "send"
msgstr "gönderim"
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:523
msgid "recv"
msgstr "alım"
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:523
msgid "change"
msgstr "deÄŸiÅŸim"
-#: sys-utils/ipcs.c:529
+#: sys-utils/ipcs.c:527
msgid "------ Message Queues PIDs --------\n"
msgstr "------ İleti Kuyrukları PID'leri --------\n"
-#: sys-utils/ipcs.c:531
+#: sys-utils/ipcs.c:529
msgid "lspid"
msgstr "lspid"
-#: sys-utils/ipcs.c:531
+#: sys-utils/ipcs.c:529
msgid "lrpid"
msgstr "lrpid"
-#: sys-utils/ipcs.c:535
+#: sys-utils/ipcs.c:533
msgid "------ Message Queues --------\n"
msgstr "------ İleti Kuyrukları --------\n"
-#: sys-utils/ipcs.c:536
+#: sys-utils/ipcs.c:534
#, c-format
msgid "%-10s %-10s %-10s %-10s %-12s %-12s\n"
msgstr "%-10s %-10s %-10s %-10s %-12s %-12s\n"
-#: sys-utils/ipcs.c:538
+#: sys-utils/ipcs.c:536
msgid "used-bytes"
msgstr "kull-bayt"
-#: sys-utils/ipcs.c:538
+#: sys-utils/ipcs.c:536
msgid "messages"
msgstr "ileti-sayısı"
-#: sys-utils/ipcs.c:606
+#: sys-utils/ipcs.c:604
#, c-format
msgid ""
"\n"
@@ -8815,37 +9037,37 @@ msgstr ""
"\n"
"Paylaşımlı bellek Segman shmid=%d\n"
-#: sys-utils/ipcs.c:607
+#: sys-utils/ipcs.c:605
#, c-format
msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
msgstr "kullkiml=%d\tgkiml=%d\tckullkiml=%d\tcgkiml=%d\n"
-#: sys-utils/ipcs.c:609
+#: sys-utils/ipcs.c:607
#, c-format
msgid "mode=%#o\taccess_perms=%#o\n"
msgstr "kip=%#o\teriÅŸim_izni=%#o\n"
-#: sys-utils/ipcs.c:611
+#: sys-utils/ipcs.c:609
#, c-format
msgid "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n"
msgstr "bayt=%d\tlpid=%d\tcpid=%d\tekSayısı=%ld\n"
-#: sys-utils/ipcs.c:614
+#: sys-utils/ipcs.c:612
#, c-format
msgid "att_time=%-26.24s\n"
msgstr "att_time=%-26.24s\n"
-#: sys-utils/ipcs.c:616
+#: sys-utils/ipcs.c:614
#, c-format
msgid "det_time=%-26.24s\n"
msgstr "det_time=%-26.24s\n"
-#: sys-utils/ipcs.c:618 sys-utils/ipcs.c:649
+#: sys-utils/ipcs.c:616 sys-utils/ipcs.c:647
#, c-format
msgid "change_time=%-26.24s\n"
msgstr "change_time=%-26.24s\n"
-#: sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:631
#, c-format
msgid ""
"\n"
@@ -8854,27 +9076,27 @@ msgstr ""
"\n"
"Ä°leti KuyruÄŸu iltkiml=%d\n"
-#: sys-utils/ipcs.c:634
+#: sys-utils/ipcs.c:632
#, c-format
msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
msgstr "kullkiml=%d\tgkiml=%d\tckullkiml=%d\tcgkiml=%d\tkip=%#o\n"
-#: sys-utils/ipcs.c:636
+#: sys-utils/ipcs.c:634
#, c-format
msgid "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
msgstr "cbayt=%ld\tqbayt=%ld\tqSayısı=%ld\tlspid=%d\tlrpid=%d\n"
-#: sys-utils/ipcs.c:645
+#: sys-utils/ipcs.c:643
#, c-format
msgid "send_time=%-26.24s\n"
msgstr "gönderim_zamanı=%-26.24s\n"
-#: sys-utils/ipcs.c:647
+#: sys-utils/ipcs.c:645
#, c-format
msgid "rcv_time=%-26.24s\n"
msgstr "alış_zamanı=%-26.24s\n"
-#: sys-utils/ipcs.c:667
+#: sys-utils/ipcs.c:665
#, c-format
msgid ""
"\n"
@@ -8883,53 +9105,48 @@ msgstr ""
"\n"
"Semafor Dizisi semkiml=%d\n"
-#: sys-utils/ipcs.c:668
+#: sys-utils/ipcs.c:666
#, c-format
msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
msgstr "kullkiml=%d\t gkiml=%d\t ckullkiml=%d\t cgkiml=%d\n"
-#: sys-utils/ipcs.c:670
+#: sys-utils/ipcs.c:668
#, c-format
msgid "mode=%#o, access_perms=%#o\n"
msgstr "kip=%#o, eriÅŸim_izni=%#o\n"
-#: sys-utils/ipcs.c:672
+#: sys-utils/ipcs.c:670
#, c-format
msgid "nsems = %ld\n"
msgstr "semSayısı = %ld\n"
-#: sys-utils/ipcs.c:673
+#: sys-utils/ipcs.c:671
#, c-format
msgid "otime = %-26.24s\n"
msgstr "otime = %-26.24s\n"
-#: sys-utils/ipcs.c:675
+#: sys-utils/ipcs.c:673
#, c-format
msgid "ctime = %-26.24s\n"
msgstr "ctime = %-26.24s\n"
-#: sys-utils/ipcs.c:677
-#, c-format
-msgid "%-10s %-10s %-10s %-10s %-10s\n"
-msgstr "%-10s %-10s %-10s %-10s %-10s\n"
-
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "semnum"
msgstr "semnum"
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "value"
msgstr "deÄŸer"
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "ncount"
msgstr "nsayısı"
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "zcount"
msgstr "zsayısı"
-#: sys-utils/ipcs.c:678
+#: sys-utils/ipcs.c:676
msgid "pid"
msgstr "pid"
@@ -9181,11 +9398,11 @@ msgstr "-- satır zaten geçti"
msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
msgstr "kullanımı: %s [ - ] [ -2 ] [ dosya ... ]\n"
-#: text-utils/column.c:298
+#: text-utils/column.c:297
msgid "line too long"
msgstr "satır çok uzun"
-#: text-utils/column.c:375
+#: text-utils/column.c:374
msgid "usage: column [-tx] [-c columns] [file ...]\n"
msgstr "kullanımı: column [-tx] [-c sütun] [dosya ...]\n"
@@ -9277,33 +9494,33 @@ msgstr ""
msgid "Can't open help file"
msgstr "Yardım dosyası açılamıyor"
-#: text-utils/more.c:1442 text-utils/more.c:1446
+#: text-utils/more.c:1442 text-utils/more.c:1447
msgid "[Press 'h' for instructions.]"
msgstr "[Yardım başlıkları için 'h' tuşuna basınız]"
-#: text-utils/more.c:1480
+#: text-utils/more.c:1481
#, c-format
msgid "\"%s\" line %d"
msgstr "\"%s\" satır %d"
-#: text-utils/more.c:1482
+#: text-utils/more.c:1483
#, c-format
msgid "[Not a file] line %d"
msgstr "[Dosya değil] satır %d"
-#: text-utils/more.c:1566
+#: text-utils/more.c:1567
msgid " Overflow\n"
msgstr " TaÅŸma\n"
-#: text-utils/more.c:1613
+#: text-utils/more.c:1614
msgid "...skipping\n"
msgstr "...atlanıyor\n"
-#: text-utils/more.c:1643
+#: text-utils/more.c:1644
msgid "Regular expression botch"
msgstr "Düzenli ifade acemice"
-#: text-utils/more.c:1655
+#: text-utils/more.c:1656
msgid ""
"\n"
"Pattern not found\n"
@@ -9311,15 +9528,15 @@ msgstr ""
"\n"
"Kalıp bulunamadı\n"
-#: text-utils/more.c:1658
+#: text-utils/more.c:1659 text-utils/pg.c:1134 text-utils/pg.c:1285
msgid "Pattern not found"
msgstr "Kalıp bulunamadı"
-#: text-utils/more.c:1719
+#: text-utils/more.c:1720
msgid "can't fork\n"
msgstr "ast süreç oluşturulamadı\n"
-#: text-utils/more.c:1758
+#: text-utils/more.c:1759
msgid ""
"\n"
"...Skipping "
@@ -9327,19 +9544,19 @@ msgstr ""
"\n"
"...Atlanıyor "
-#: text-utils/more.c:1763
+#: text-utils/more.c:1764
msgid "...Skipping to file "
msgstr "...Dosyaya atlanıyor: "
-#: text-utils/more.c:1765
+#: text-utils/more.c:1766
msgid "...Skipping back to file "
msgstr "...Önceki dosyaya atlanıyor: "
-#: text-utils/more.c:2046
+#: text-utils/more.c:2047
msgid "Line too long"
msgstr "Satır çok uzun"
-#: text-utils/more.c:2089
+#: text-utils/more.c:2090
msgid "No previous command to substitute for"
msgstr "Yerini alacak öncesinde bir komut yok"
@@ -9389,6 +9606,102 @@ msgstr "hexdump: biçem hatalı {%s}\n"
msgid "hexdump: bad conversion character %%%s.\n"
msgstr "hexdump: dönüşüm karakteri %%%s hatalı.\n"
+#: text-utils/pg.c:246
+#, c-format
+msgid ""
+"%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
+msgstr ""
+
+#: text-utils/pg.c:255
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- %s\n"
+msgstr "`%s' seçeneği bir argümanla kullanılır\n"
+
+#: text-utils/pg.c:263
+#, fuzzy, c-format
+msgid "%s: illegal option -- %s\n"
+msgstr "%s: kuraldışı seçenek -- %c\n"
+
+#: text-utils/pg.c:380
+#, fuzzy
+msgid "...skipping forward\n"
+msgstr "...atlanıyor\n"
+
+#: text-utils/pg.c:382
+#, fuzzy
+msgid "...skipping backward\n"
+msgstr "...atlanıyor\n"
+
+#: text-utils/pg.c:404
+#, fuzzy
+msgid "No next file"
+msgstr "(Sonraki dosya: %s)"
+
+#: text-utils/pg.c:408
+#, fuzzy
+msgid "No previous file"
+msgstr "Atanmış disk bölümü yok\n"
+
+#: text-utils/pg.c:938
+#, fuzzy, c-format
+msgid "%s: Read error from %s file\n"
+msgstr "%s: %s üzerinde okuma hatası\n"
+
+#.
+#. * Most likely '\0' in input.
+#.
+#: text-utils/pg.c:944
+#, c-format
+msgid "%s: Unexpected EOF in %s file\n"
+msgstr ""
+
+#: text-utils/pg.c:947
+#, fuzzy, c-format
+msgid "%s: Unknown error in %s file\n"
+msgstr "kimlikte bilinmeyen hata"
+
+#: text-utils/pg.c:1042
+#, fuzzy, c-format
+msgid "%s: Cannot create tempfile\n"
+msgstr "%s: geçici dosya okunamıyor.\n"
+
+#: text-utils/pg.c:1051 text-utils/pg.c:1226
+#, fuzzy
+msgid "RE error: "
+msgstr ", hata"
+
+#: text-utils/pg.c:1208
+msgid "(EOF)"
+msgstr ""
+
+#: text-utils/pg.c:1234
+msgid "No remembered search string"
+msgstr ""
+
+#: text-utils/pg.c:1317
+#, fuzzy
+msgid "Cannot open "
+msgstr "%s açılamıyor\n"
+
+#: text-utils/pg.c:1365
+#, fuzzy
+msgid "saved"
+msgstr "gönderim"
+
+#: text-utils/pg.c:1472
+msgid ": !command not allowed in rflag mode.\n"
+msgstr ""
+
+#: text-utils/pg.c:1504
+#, fuzzy
+msgid "fork() failed, try again later\n"
+msgstr "Parola deÄŸiÅŸtirilmedi! Daha sonra tekrar deneyin.\n"
+
+#: text-utils/pg.c:1709
+#, fuzzy
+msgid "(Next file: "
+msgstr "(Sonraki dosya: %s)"
+
#: text-utils/rev.c:113
msgid "Unable to allocate bufferspace\n"
msgstr "Tampon alanı ayrılamadı\n"
@@ -9422,3 +9735,24 @@ msgstr "Girdi satırı çok uzun.\n"
#: text-utils/ul.c:599
msgid "Out of memory when growing buffer.\n"
msgstr "Tampon büyütülürken bellek yetmedi.\n"
+
+#~ msgid "invalid number `%s'\n"
+#~ msgstr "`%s' geçersiz sayı\n"
+
+#~ msgid "number `%s' to `%s' out of range\n"
+#~ msgstr "`%s' `%s' aralığının dışında\n"
+
+#~ msgid "unrecognized option `%s'\n"
+#~ msgstr "`%s' seçeneği bilinmiyor\n"
+
+#~ msgid "option `%s' requires an argument\n"
+#~ msgstr "`%s' seçeneği bir argümanla kullanılır\n"
+
+#~ msgid "option `%s' doesn't allow an argument\n"
+#~ msgstr "`%s' seçeneği bir argümansız kullanılır\n"
+
+#~ msgid "unrecognized option `-%c'\n"
+#~ msgstr "`-%c' seçeneği bilinmiyor\n"
+
+#~ msgid "%-10s %-10s %-10s %-10s %-10s %-12s\n"
+#~ msgstr "%-10s %-10s %-10s %-10s %-10s %-12s\n"
diff --git a/sys-utils/ipcrm.8 b/sys-utils/ipcrm.8
index f8281d377..6e3b97d17 100644
--- a/sys-utils/ipcrm.8
+++ b/sys-utils/ipcrm.8
@@ -6,58 +6,91 @@ ipcrm \- remove a message queue, semaphore set or shared memory id
.SH SYNOPSIS
.B ipcrm
[
-.I options
-]
+.B \-M
+.I key
+|
+.B \-m
+.I id
+|
+.B \-Q
+.I key
+|
+.B \-q
+.I id
+|
+.B \-S
+.I key
+|
+.B \-s
+.I id
+] ...
deprecated usage
.BI ipcrm
[
-.I shm
+.B shm
|
-.I msg
+.B msg
|
-.I sem
+.B sem
]
-.IR id ...
+.IR id " ..."
.SH DESCRIPTION
.I ipcrm
-will remove messages, semphores or shared memory segments specified by
-.IR key " or" " id" .
+removes System V interprocess communication (IPC) objects
+and associated data structures from the system.
+In order to delete such objects, you must be superuser, or
+the creator or owner of the object.
+
+System V IPC objects are of three types: shared memory,
+message queues, and semaphores.
+Deletion of a message queue or semaphore object is immediate
+(regardless of whether any process still holds an IPC
+identifier for the object).
+A shared memory object is only removed
+after all currently attached processes have detached
+.RB ( shmdt (2))
+the object from their virtual address space.
+
+Two syntax styles are supported. The old Linux historical syntax specifies
+a three letter keyword indicating which class of object is to be deleted,
+followed by one or more IPC identifiers for objects of this type.
+
+The SUS-compliant syntax allows the specification of
+zero or more objects of all three types in a single command line,
+with objects specified either by key or by identifier. (See below.)
+Both keys and identifiers may be specified in decimal, hexadecimal
+(specified with an initial '0x' or '0X'), or octal (specified with
+an initial '0').
+
.SH OPTIONS
-The identifiers are specified thus:
.TP
-.BI \-q " msgid"
-removes the message queue identified by
-.I msgid
-from the system along with its associated data structures.
+.BI \-M " shmkey"
+removes the shared memory segment created with
+.I shmkey
+after the last detach is performed.
.TP
.BI \-m " shmid"
removes the shared memory segment identified by
.I shmid
-from the system along with its associated data structures after the last
-detach is performed.
-.TP
-.BI \-s " semid"
-removes the semaphore identified by
-.IR semid
-from the system along with its associated data structures.
+after the last detach is performed.
.TP
.BI \-Q " msgkey"
removes the message queue created with
-.I msgkey
-from the system along with its associated data structures.
+.IR msgkey .
.TP
-.BI \-M " shmkey"
-removes the shared memory segment created with
-.I shmkey
-from the system along with its associated data structures after the last
-detach is performed.
+.BI \-q " msgid"
+removes the message queue identified by
+.IR msgid .
.TP
.BI \-S " semkey"
removes the semaphore created with
-.IR semkey
-from the system along with its associated data structures.
+.IR semkey .
+.TP
+.BI \-s " semid"
+removes the semaphore identified by
+.IR semid .
.LP
The details of the removes are described in
.IR msgctl (2),
@@ -67,23 +100,25 @@ and
The identifiers and keys may be found by using
.IR ipcs (8).
.SH NOTES
-In its first implementation, ipcrm used the deprecated syntax shown in the
+In its first Linux implementation, ipcrm used the deprecated syntax
+shown in the
.BR SYNOPSIS .
Functionality present in other *nix implementations of ipcrm has since
been added, namely the ability to delete resources by key (not just
identifier), and to respect the same command-line syntax. For backward
compatibility the previous syntax is still supported.
-.SH AUTHORS
-Andre C. Mazzone (linuxdev@karagee.com)
-.br
-Krishna Balasubramanian (balasub@cis.ohio-state.edu)
-.nh
+.\" .SH AUTHORS
+.\" Andre C. Mazzone (linuxdev@karagee.com)
+.\" .br
+.\" Krishna Balasubramanian (balasub@cis.ohio-state.edu)
.SH SEE ALSO
+.nh
.BR ipcs (8),
.BR msgctl (2),
.BR msgget (2),
.BR semctl (2),
.BR semget (2),
.BR shmctl (2),
-.BR shmget (2)
-
+.BR shmdt (2),
+.BR shmget (2),
+.BR ftok (3)
diff --git a/sys-utils/ipcs.c b/sys-utils/ipcs.c
index 01cc49488..d93d40833 100644
--- a/sys-utils/ipcs.c
+++ b/sys-utils/ipcs.c
@@ -16,7 +16,6 @@
1999-02-22 Arkadiusz Mi¶kiewicz <misiek@pld.ORG.PL>
- added Native Language Support
-
*/
#include <stdio.h>
@@ -430,9 +429,9 @@ void do_sem (char format)
default:
printf (_("------ Semaphore Arrays --------\n"));
- printf (_("%-10s %-10s %-10s %-10s %-10s %-12s\n"),
+ printf (_("%-10s %-10s %-10s %-10s %-10s\n"),
_("key"),_("semid"),_("owner"),_("perms"),
- _("nsems"),_("status"));
+ _("nsems"));
break;
}
@@ -461,7 +460,7 @@ void do_sem (char format)
break;
default:
- printf( "0x%08x ",ipcp->KEY );
+ printf("0x%08x ", ipcp->KEY);
if (pw)
printf ("%-10d %-10.9s", semid, pw->pw_name);
else
@@ -478,7 +477,6 @@ void do_sem (char format)
break;
}
}
- return;
}
diff --git a/text-utils/LICENSE.pg b/text-utils/LICENSE.pg
new file mode 100644
index 000000000..e805a3158
--- /dev/null
+++ b/text-utils/LICENSE.pg
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2000-2001 Gunnar Ritter. 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. [deleted]
+ * 4. Neither the name of Gunnar Ritter nor the names of his contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY GUNNAR RITTER 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 GUNNAR RITTER 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.
+ */
diff --git a/text-utils/Makefile b/text-utils/Makefile
index c8d32ad1a..6fecb2f85 100644
--- a/text-utils/Makefile
+++ b/text-utils/Makefile
@@ -6,9 +6,9 @@
include ../make_include
include ../MCONFIG
-MAN1= col.1 colcrt.1 colrm.1 column.1 hexdump.1 rev.1 line.1
+MAN1= col.1 colcrt.1 colrm.1 column.1 hexdump.1 rev.1 line.1 pg.1
-USRBIN= col colcrt colrm column hexdump rev line
+USRBIN= col colcrt colrm column hexdump rev line pg
BIN=
@@ -25,26 +25,32 @@ MAN1:=$(MAN1) more.1
endif
endif
-# Where to put datebase files?
-
+# Where to put database files?
MOREHELP= more.help
MOREHELPFILE=$(MOREHELP_DIR)/$(MOREHELP)
# MOREHELP_DIR and MOREHELPDIR set in ../MCONFIG
CFLAGS:=$(CFLAGS) -DMOREHELPFILE=\"$(MOREHELPFILE)\"
+# Is pg silent?
+ifeq "$(SILENT_PG)" "yes"
+CFLAGS:=$(CFLAGS) -DPGNOBELL
+endif
+
all: $(BIN) $(USRBIN)
-# more and ul use curses - maybe we can't compile them
+# more and pg and ul use curses - maybe we can't compile them
ifeq "$(HAVE_NCURSES)" "yes"
-# Have ncurses - make more and ul
-more ul:
+# Have ncurses - make more and pg and ul
+more pg ul:
$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBCURSES)
more: more.o $(LIB)/xstrncpy.o
+pg: pg.o
ul: ul.o
else
-# Do not have ncurses - give up on ul
-ul:
+# Do not have ncurses - give up on pg and ul
+pg ul:
@echo $@ not made since it requires ncurses
+# For more we can also try termcap
ifeq "$(HAVE_TERMCAP)" "yes"
more: more.o $(LIB)/xstrncpy.o
$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBTERMCAP)
@@ -71,12 +77,7 @@ column.o: $(LIB)/errs.h
column: column.o $(ERR_O)
more.o: more.c $(LIB)/pathnames.h
rev: rev.o
-line: line.sh
-
-%: %.sh
- cp $@.sh $@
- chmod 755 $@
-
+line: line.o
colcrt.o colrm.o column.o rev.o ul.o: $(LIB)/widechar.h
diff --git a/text-utils/README.pg b/text-utils/README.pg
new file mode 100644
index 000000000..df92b85fd
--- /dev/null
+++ b/text-utils/README.pg
@@ -0,0 +1,23 @@
+README for the "pg" utility for Linux.
+
+The "pg" utility is the historic System V equivalent to BSD's "more". This
+is a free clone of it, and it is intended to conform to the SVID 4 as well
+as the SUSv2 specification of this command.
+
+Contrasting to the System V implementation, this one filters backspace
+formatting sequences while searching, so you can comfortably search in nroff
+output like manual pages.
+
+This code uses routines as defined by SUSv2, so a glibc version of 2.1 or
+higher is required on Linux. A curses implementation (like ncurses) must
+be present as well.
+
+If large files > 2GB are supported by the kernel and the C library, pg is
+able to handle them.
+
+Please send comments, bug-reports and especially bug-fixes to
+<g-r@bigfoot.de> .
+
+Gunnar Ritter
+Freiburg i. Br.
+Germany
diff --git a/text-utils/column.c b/text-utils/column.c
index 22b4c120d..0320bd0a8 100644
--- a/text-utils/column.c
+++ b/text-utils/column.c
@@ -62,13 +62,13 @@ 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 *));
-void maketbl __P((void));
-void print __P((void));
-void r_columnate __P((void));
-void usage __P((void));
+static void c_columnate __P((void));
+static void *emalloc __P((int));
+static void input __P((FILE *));
+static void maketbl __P((void));
+static void print __P((void));
+static void r_columnate __P((void));
+static void usage __P((void));
int termwidth = 80; /* default terminal width */
@@ -87,10 +87,9 @@ main(int argc, char **argv)
int ch, tflag, xflag;
char *p;
-#ifdef __linux__
extern char *__progname;
__progname = argv[0];
-#endif
+
setlocale(LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
@@ -151,7 +150,7 @@ main(int argc, char **argv)
}
#define TAB 8
-void
+static void
c_columnate()
{
int chcnt, col, cnt, endcol, numcols;
@@ -181,7 +180,7 @@ c_columnate()
putwchar('\n');
}
-void
+static void
r_columnate()
{
int base, chcnt, cnt, col, endcol, numcols, numrows, row;
@@ -211,7 +210,7 @@ r_columnate()
}
}
-void
+static void
print()
{
int cnt;
@@ -229,7 +228,7 @@ typedef struct _tbl {
} TBL;
#define DEFCOLS 25
-void
+static void
maketbl()
{
TBL *t;
@@ -280,7 +279,7 @@ maketbl()
#define DEFNUM 1000
#define MAXLINELEN (LINE_MAX + 1)
-void
+static void
input(fp)
FILE *fp;
{
@@ -355,7 +354,7 @@ static char *mtsafe_strtok(char *str, const char *delim, char **ptr)
}
#endif
-void *
+static void *
emalloc(size)
int size;
{
@@ -367,7 +366,7 @@ emalloc(size)
return (p);
}
-void
+static void
usage()
{
diff --git a/text-utils/line.1 b/text-utils/line.1
index 2c356a6bd..2d8e66802 100644
--- a/text-utils/line.1
+++ b/text-utils/line.1
@@ -1,17 +1,14 @@
.\" This page is in the public domain
-.Dd August 2, 2001
-.Dt line 1
-.Os Linux 2.4
-.Sh NAME
-.Nm line
-.Nd read one line
-.Sh SYNOPSIS
-.Nm
-.Sh DESCRIPTION
-.Nm
-copies one line (up to a newline) from standard input and writes it to
-standard output. It always prints at least a newline and returns an exit
-code of 1 on EOF.
-.Sh SEE ALSO
-.Xr read 2 ,
-.Xr sh 1
+.TH LINE 1 "2002-07-07" "" "User Commands"
+.SH NAME
+line \- read one line
+.SH SYNOPSIS
+.B line
+.SH DESCRIPTION
+The utility
+.I line
+copies one line (up to a newline) from standard input to standard output.
+It always prints at least a newline and returns an exit status of 1
+on EOF or read error.
+.SH "SEE ALSO"
+.BR read (1)
diff --git a/text-utils/line.c b/text-utils/line.c
new file mode 100644
index 000000000..d4bb86ddb
--- /dev/null
+++ b/text-utils/line.c
@@ -0,0 +1,38 @@
+/*
+ * line - read one line
+ *
+ * Gunnar Ritter, Freiburg i. Br., Germany, December 2000.
+ *
+ * Public Domain.
+ */
+
+#ident "@(#)line.c 1.7 (gritter) 7/5/02"
+
+#include <stdio.h>
+#include <unistd.h>
+
+static int status; /* exit status */
+
+static void
+doline(int fd)
+{
+ char c;
+
+ for (;;) {
+ if (read(fd, &c, 1) <= 0) {
+ status = 1;
+ break;
+ }
+ if (c == '\n')
+ break;
+ putchar(c);
+ }
+ putchar('\n');
+}
+
+int
+main(int argc, char **argv)
+{
+ doline(0);
+ return status;
+}
diff --git a/text-utils/line.sh b/text-utils/line.sh
deleted file mode 100644
index 0d1c59c7d..000000000
--- a/text-utils/line.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-#
-# line read one line
-#
-# Version: $Id: line,v 1.1 2001/08/03 14:54:10 hch Exp hch $
-#
-# Author: Christoph Hellwig <hch@caldera.de>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version
-# 2 of the License, or (at your option) any later version.
-#
-
-read line
-echo ${line}
-
-if [ -z "${line}" ]; then
- exit 1
-else
- exit 0
-fi
diff --git a/text-utils/more.c b/text-utils/more.c
index 130f1020f..8a5640a43 100644
--- a/text-utils/more.c
+++ b/text-utils/more.c
@@ -1439,7 +1439,8 @@ int command (char *filename, register FILE *f)
kill_line ();
if (Senter && Sexit) {
my_putstring (Senter);
- promptlen = pr (_("[Press 'h' for instructions.]")) + (2 * soglitch);
+ promptlen = pr (_("[Press 'h' for instructions.]"))
+ + 2 * soglitch;
my_putstring (Sexit);
}
else
@@ -1794,13 +1795,13 @@ retry:
* Wait until we're in the foreground before we save the
* the terminal modes.
*/
- if (ioctl(fileno(stdout), TIOCGPGRP, &tgrp) < 0) {
- perror("TIOCGPGRP");
- exit(1);
+ if ((tgrp = tcgetpgrp(fileno(stdout))) < 0) {
+ perror("tcgetpgrp");
+ exit(1);
}
if (tgrp != getpgrp(0)) {
- kill(0, SIGTTOU);
- goto retry;
+ kill(0, SIGTTOU);
+ goto retry;
}
}
#endif
@@ -1903,7 +1904,7 @@ int readch () {
unsigned char c;
errno = 0;
- if (read (2, &c, 1) <= 0) {
+ if (read (fileno(stderr), &c, 1) <= 0) {
if (errno != EINTR)
end_it(0);
else
diff --git a/text-utils/pg.1 b/text-utils/pg.1
new file mode 100644
index 000000000..056be06cf
--- /dev/null
+++ b/text-utils/pg.1
@@ -0,0 +1,238 @@
+.\" @(#)pg.1 1.7 (gritter) 4/25/01
+.TH PG 1 "2001-04-25" "Gunnar Ritter" "User Commands"
+.SH NAME
+pg \- browse pagewise through text files
+.SH SYNOPSIS
+.B pg
+[
+.I \-number
+] [
+.BI \-p \ string
+] [
+.B \-cefnrs
+] [
+.I +line
+] [
+.I +/pattern/
+] [ file . . . ]
+.SH DESCRIPTION
+.I Pg
+displays a text file on a
+.SM CRT
+one screenful at once.
+After each page, a prompt is displayed. The user may then either press the
+newline key to view the next page or one of the keys described below.
+.PP
+If no filename is given on the command line,
+.I pg
+reads from standard input.
+If the standard output is not a terminal,
+.I pg
+acts like
+.IR cat (1)
+but precedes each file with its name if there is more than one.
+.PP
+If input comes from a pipe,
+.I pg
+stores the data in a buffer file while reading
+to make navigation possible.
+.SH OPTIONS
+.I Pg
+accepts the following options:
+.TP
+.BI \- number
+The number of lines per page. Usually, this is the number of
+.SM CRT
+lines
+minus one.
+.TP
+.B \-c
+Clear the screen before a page is displayed
+if the terminfo entry for the terminal provides this capability.
+.TP
+.B \-e
+.I pg
+will not pause and display
+.SM (EOF)
+at the end of a file.
+.TP
+.B \-f
+.I pg
+does not split long lines.
+.TP
+.B \-n
+Without this option, commands must be terminated by a newline character. With
+this option,
+.I pg
+advances once a command letter is entered.
+.TP
+.BI \-p \ string
+Instead of the prompt
+.I " :"
+,
+.I string
+is displayed.
+If
+.I string
+contains
+.I %d
+, its first occurence is replaced by the number of the current page.
+.TP
+.B \-r
+Disallow the shell escape.
+.TP
+.B \-s
+Print messages in
+.I standout
+mode
+if the terminfo entry for the terminal provides this capability.
+.TP
+.BI + number
+Start at the given line.
+.TP
+.BI +/ pattern /
+Start at the line containing the Basic Regular Expression
+.I pattern
+given.
+.SH USAGE
+The following commands may be entered at the prompt. Commands preceeded by
+.I i
+in this document accept a number as argument, positive or negative.
+If this argument starts with
+.I +
+or
+.I \-,
+it is interpreted relative to the current position in the input file,
+otherwise relative to the beginning.
+.TP
+.IB i <newline>
+Display the next or the indicated page.
+.TP
+\fIi\fR\fBd\fR or \fB^D\fR
+Display the next halfpage. If
+.I i
+is given, it is always interpreted relative to the current position.
+.TP
+.IB i l
+Display the next or the indicated line.
+.TP
+.IB i f
+Skip a page forward.
+.I i
+must be a positive number and is always interpreted relative
+to the current position.
+.TP
+\fIi\fR\fBw\fR or \fIi\fR\fBz\fR
+Behave as
+.I <newline>
+except that
+.I i
+becomes the new page size.
+.TP
+.BR . " or " ^L
+Redraw the screen.
+.TP
+.B $
+Advance to the last line of the input file.
+.TP
+.IB i / pattern /
+Search forward until the first or the \fIi\fR-th
+occurence of the Basic Regular Expression
+.I pattern
+is found. The search starts
+after the current page and stops at the end of the file. No wrap-around is
+performed.
+.I i
+must be a positive number.
+.TP
+\fIi\fR\fB?\fR\fIpattern\fR\fB?\fR or \fIi\fR\fB^\fR\fIpattern\fR\fB^\fR
+Search backward until the first or the \fIi\fR-th
+occurence of the Basic Regular Expression
+.I pattern
+is found. The search starts
+before the current page and stops at the beginning of the file.
+No wrap-around is performed.
+.I i
+must be a positive number.
+.PP
+The search commands accept an added letter. If
+.B t
+is given, the line containing the pattern is displayed at the top of the
+screen, which is the default.
+.B m
+selects the middle and
+.B b
+the bottom of the screen.
+The selected position is used in following searches, too.
+.TP
+.IB i n
+Advance to the next file or
+.I i
+files forward.
+.TP
+.IB i p
+Reread the previous file or
+.I i
+files backward.
+.TP
+.BI s \ filename
+Save the current file to the given
+.I filename.
+.TP
+.B h
+Display a command summary.
+.TP
+.BI ! command
+Execute
+.I command
+using the shell.
+.TP
+.BR q " or " Q
+Quit.
+.PP
+If the user presses the interrupt or quit key while
+.I pg
+reads from the
+input file or writes on the terminal,
+.I pg
+will immediately display the prompt.
+In all other situations these keys will terminate
+.I pg.
+.SH "ENVIRONMENT VARIABLES"
+The following environment variables
+affect the behaviour of
+.I pg:
+.TP
+.B COLUMNS
+Overrides the system-supplied number of columns if set.
+.TP
+.BR LANG ,\ LC_ALL ,\ LC_COLLATE ,\ LC_CTYPE ,\ LC_MESSAGES
+See
+.IR locale (7).
+.TP
+.B LINES
+Overrides the system-supplied number of lines if set.
+.TP
+.B SHELL
+Used by the
+.B !
+command.
+.TP
+.B TERM
+Determines the terminal type.
+.SH "SEE ALSO"
+.BR cat (1),
+.BR more (1),
+.BR sh (1),
+.BR terminfo (5),
+.BR locale (7),
+.BR regex (7),
+.BR term (7)
+.SH NOTES
+.I pg
+expects the terminal tabulators to set on eight positions.
+.PP
+Files that include
+.SM NUL
+characters cannot be displayed by
+.IR pg .
diff --git a/text-utils/pg.c b/text-utils/pg.c
new file mode 100644
index 000000000..57290756c
--- /dev/null
+++ b/text-utils/pg.c
@@ -0,0 +1,1775 @@
+/*
+ * pg - A clone of the System V CRT paging utility.
+ *
+ * Copyright (c) 2000-2001 Gunnar Ritter. 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. [deleted]
+ * 4. Neither the name of Gunnar Ritter nor the names of his contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY GUNNAR RITTER 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 GUNNAR RITTER 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.
+ */
+
+/* Sccsid @(#)pg.c 1.44 (gritter) 2/8/02 - modified for util-linux */
+
+/*
+ * #define _XOPEN_SOURCE 500L
+ *
+ * Adding this define gives us the correct prototypes for fseeko, ftello,
+ * but (for some glibc versions) conflicting prototype for wcwidth.
+ * So, avoid defining _XOPEN_SOURCE, and give prototypes for fseeko, ftello
+ * by hand.
+ */
+
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <sys/stat.h>
+#ifndef TIOCGWINSZ
+#include <sys/ioctl.h>
+#endif
+#include <sys/termios.h>
+#include <fcntl.h>
+#include <regex.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <ctype.h>
+#include <errno.h>
+#include <unistd.h>
+#include <signal.h>
+#include <setjmp.h>
+#include <locale.h>
+#include <nl_types.h>
+#include <libgen.h>
+#include <curses.h>
+#include <term.h>
+
+#include "nls.h"
+#include "widechar.h"
+#include "../defines.h" /* for HAVE_fseeko */
+
+#define READBUF LINE_MAX /* size of input buffer */
+#define CMDBUF 255 /* size of command buffer */
+#define TABSIZE 8 /* spaces consumed by tab character */
+
+/*
+ * Avoid the message "`var' might be clobbered by `longjmp' or `vfork'"
+ */
+#define CLOBBGRD(a) (void)(&(a));
+
+#define cuc(c) ((c) & 0377)
+
+enum { FORWARD = 1, BACKWARD = 2 }; /* search direction */
+enum { TOP, MIDDLE, BOTTOM }; /* position of matching line */
+
+/*
+ * States for syntax-aware command line editor.
+ */
+enum {
+ COUNT,
+ SIGN,
+ CMD_FIN,
+ SEARCH,
+ SEARCH_FIN,
+ ADDON_FIN,
+ STRING,
+ INVALID
+};
+
+/*
+ * Current command
+ */
+struct {
+ char cmdline[CMDBUF];
+ size_t cmdlen;
+ int count;
+ int key;
+ char pattern[CMDBUF];
+ char addon;
+} cmd;
+
+/*
+ * Position of file arguments on argv[] to main()
+ */
+struct {
+ int first;
+ int current;
+ int last;
+} files;
+
+void (*oldint)(int); /* old SIGINT handler */
+void (*oldquit)(int); /* old SIGQUIT handler */
+void (*oldterm)(int); /* old SIGTERM handler */
+char *tty; /* result of ttyname(1) */
+char *progname; /* program name */
+unsigned ontty; /* whether running on tty device */
+unsigned exitstatus; /* exit status */
+int pagelen = 23; /* lines on a single screen page */
+int ttycols = 79; /* screen columns (starting at 0) */
+struct termios otio; /* old termios settings */
+int tinfostat = -1; /* terminfo routines initialized */
+int searchdisplay = TOP; /* matching line position */
+regex_t re; /* regular expression to search for */
+int remembered; /* have a remembered search string */
+int cflag; /* clear screen before each page */
+int eflag; /* suppress (EOF) */
+int fflag; /* do not split lines */
+int nflag; /* no newline for commands required */
+int rflag; /* "restricted" pg */
+int sflag; /* use standout mode */
+char *pstring = ":"; /* prompt string */
+char *searchfor; /* search pattern from argv[] */
+int havepagelen; /* page length is manually defined */
+long startline; /* start line from argv[] */
+int nextfile = 1; /* files to advance */
+jmp_buf jmpenv; /* jump from signal handlers */
+int canjump; /* jmpenv is valid */
+wchar_t wbuf[READBUF]; /* used in several widechar routines */
+
+const char *copyright =
+"@(#)pg 1.44 2/8/02. Copyright (c) 2000-2001 Gunnar Ritter. ";
+const char *helpscreen = "All rights reserved.\n\
+-------------------------------------------------------\n\
+ h this screen\n\
+ q or Q quit program\n\
+ <newline> next page\n\
+ f skip a page forward\n\
+ d or ^D next halfpage\n\
+ l next line\n\
+ $ last page\n\
+ /regex/ search forward for regex\n\
+ ?regex? or ^regex^ search backward for regex\n\
+ . or ^L redraw screen\n\
+ w or z set page size and go to next page\n\
+ s filename save current file to filename\n\
+ !command shell escape\n\
+ p go to previous file\n\
+ n go to next file\n\
+\n\
+Many commands accept preceding numbers, for example:\n\
++1<newline> (next page); -1<newline> (previous page); 1<newline> (first page).\n\
+\n\
+See pg(1) for more information.\n\
+-------------------------------------------------------\n";
+
+#ifdef HAVE_fseeko
+ extern int fseeko(FILE *f, off_t off, int whence);
+ extern off_t ftello(FILE *f);
+ #define my_fseeko fseeko
+ #define my_ftello ftello
+#else
+ static int my_fseeko(FILE *f, off_t off, int whence) {
+ return fseek(f, (long) off, whence);
+ }
+ static off_t my_ftello(FILE *f) {
+ return (off_t) ftell(f);
+ }
+#endif
+
+#ifdef USE_SIGSET /* never defined */
+/* sigset and sigrelse are obsolete - use when POSIX stuff is unavailable */
+#define my_sigset sigset
+#define my_sigrelse sigrelse
+#else
+static int my_sigrelse(int sig) {
+ sigset_t sigs;
+
+ if (sigemptyset(&sigs) || sigaddset(&sigs, sig))
+ return -1;
+ return sigprocmask(SIG_UNBLOCK, &sigs, NULL);
+}
+typedef void (*my_sighandler_t)(int);
+static my_sighandler_t my_sigset(int sig, my_sighandler_t disp) {
+ struct sigaction act, oact;
+
+ act.sa_handler = disp;
+ if (sigemptyset(&act.sa_mask))
+ return SIG_ERR;
+ act.sa_flags = 0;
+ if (sigaction(sig, &act, &oact))
+ return SIG_ERR;
+ if (my_sigrelse(sig))
+ return SIG_ERR;
+ return oact.sa_handler;
+}
+#endif
+
+/*
+ * Quit pg.
+ */
+static void
+quit(int status)
+{
+ exit(status < 0100 ? status : 077);
+}
+
+/*
+ * Memory allocator including check.
+ */
+static char *
+smalloc(size_t s)
+{
+ char *m = (char *)malloc(s);
+ if (m == NULL) {
+ write(2, "Out of memory\n", 14);
+ quit(++exitstatus);
+ }
+ return m;
+}
+
+/*
+ * Usage message and similar routines.
+ */
+static void
+usage(void)
+{
+ fprintf(stderr, _("%s: Usage: %s [-number] [-p string] [-cefnrs] "
+ "[+line] [+/pattern/] [files]\n"),
+ progname, progname);
+ quit(2);
+}
+
+static void
+needarg(char *s)
+{
+ fprintf(stderr, _("%s: option requires an argument -- %s\n"),
+ progname, s);
+ usage();
+}
+
+static void
+invopt(char *s)
+{
+ fprintf(stderr, _("%s: illegal option -- %s\n"), progname, s);
+ usage();
+}
+
+#ifdef ENABLE_WIDECHAR
+/*
+ * A mbstowcs()-alike function that transparently handles invalid sequences.
+ */
+static size_t
+xmbstowcs(wchar_t *pwcs, const char *s, size_t nwcs)
+{
+ size_t n = nwcs;
+ int c;
+
+ mbtowc(pwcs, NULL, MB_CUR_MAX);
+ while (*s && n) {
+ if ((c = mbtowc(pwcs, s, MB_CUR_MAX)) < 0) {
+ s++;
+ *pwcs = L'?';
+ } else
+ s += c;
+ pwcs++;
+ n--;
+ }
+ if (n)
+ *pwcs = L'\0';
+ mbtowc(pwcs, NULL, MB_CUR_MAX);
+ return nwcs - n;
+}
+#endif
+
+/*
+ * Helper function for tputs().
+ */
+static int
+outcap(int i)
+{
+ char c = i;
+ return write(1, &c, 1);
+}
+
+/*
+ * Write messages to terminal.
+ */
+static void
+mesg(char *message)
+{
+ if (ontty == 0)
+ return;
+ if (*message != '\n' && sflag)
+ vidputs(A_STANDOUT, outcap);
+ write(1, message, strlen(message));
+ if (*message != '\n' && sflag)
+ vidputs(A_NORMAL, outcap);
+}
+
+/*
+ * Get the window size.
+ */
+static void
+getwinsize(void)
+{
+ static int initialized, envlines, envcols, deflines, defcols;
+#ifdef TIOCGWINSZ
+ struct winsize winsz;
+ int badioctl;
+#endif
+ char *p;
+
+ if (initialized == 0) {
+ if ((p = getenv("LINES")) != NULL && *p != '\0')
+ if ((envlines = atoi(p)) < 0)
+ envlines = 0;
+ if ((p = getenv("COLUMNS")) != NULL && *p != '\0')
+ if ((envcols = atoi(p)) < 0)
+ envcols = 0;
+ /* terminfo values. */
+ if (tinfostat != 1 || columns == 0)
+ defcols = 24;
+ else
+ defcols = columns;
+ if (tinfostat != 1 || lines == 0)
+ deflines = 80;
+ else
+ deflines = lines;
+ initialized = 1;
+ }
+#ifdef TIOCGWINSZ
+ badioctl = ioctl(1, TIOCGWINSZ, &winsz);
+#endif
+ if (envcols)
+ ttycols = envcols - 1;
+#ifdef TIOCGWINSZ
+ else if (!badioctl)
+ ttycols = winsz.ws_col - 1;
+#endif
+ else
+ ttycols = defcols - 1;
+ if (havepagelen == 0) {
+ if (envlines)
+ pagelen = envlines - 1;
+#ifdef TIOCGWINSZ
+ else if (!badioctl)
+ pagelen = winsz.ws_row - 1;
+#endif
+ else
+ pagelen = deflines - 1;
+ }
+}
+
+/*
+ * Message if skipping parts of files.
+ */
+static void
+skip(int direction)
+{
+ if (direction > 0)
+ mesg(_("...skipping forward\n"));
+ else
+ mesg(_("...skipping backward\n"));
+}
+
+/*
+ * Signal handler while reading from input file.
+ */
+static void
+sighandler(int signum)
+{
+ if (canjump && (signum == SIGINT || signum == SIGQUIT))
+ longjmp(jmpenv, signum);
+ tcsetattr(1, TCSADRAIN, &otio);
+ quit(exitstatus);
+}
+
+/*
+ * Check whether the requested file was specified on the command line.
+ */
+static int
+checkf(void)
+{
+ if (files.current + nextfile >= files.last) {
+ mesg(_("No next file"));
+ return 1;
+ }
+ if (files.current + nextfile < files.first) {
+ mesg(_("No previous file"));
+ return 1;
+ }
+ return 0;
+}
+
+#ifdef ENABLE_WIDECHAR
+/*
+ * Return the last character that will fit on the line at col columns
+ * in case MB_CUR_MAX > 1.
+ */
+static char *
+endline_for_mb(unsigned col, char *s)
+{
+ unsigned pos = 0;
+ wchar_t *p = wbuf;
+ wchar_t *end;
+ size_t wl;
+ char *t = s;
+
+ if ((wl = xmbstowcs(wbuf, t, sizeof wbuf - 1)) == (size_t)-1)
+ return s + 1;
+ wbuf[wl] = L'\0';
+ while (*p != L'\0') {
+ switch (*p) {
+ /*
+ * Cursor left.
+ */
+ case L'\b':
+ if (pos > 0)
+ pos--;
+ break;
+ /*
+ * No cursor movement.
+ */
+ case L'\a':
+ break;
+ /*
+ * Special.
+ */
+ case L'\r':
+ pos = 0;
+ break;
+ case L'\n':
+ end = p + 1;
+ goto ended;
+ /*
+ * Cursor right.
+ */
+ case L'\t':
+ pos += TABSIZE - (pos % TABSIZE);
+ break;
+ default:
+ pos += wcwidth(*p);
+ }
+ if (pos > col) {
+ if (*p == L'\t')
+ p++;
+ else if (pos > col + 1)
+ /*
+ * wcwidth() found a character that
+ * has multiple columns. What happens
+ * now? Assume the terminal will print
+ * the entire character onto the next
+ * row.
+ */
+ p--;
+ if (*++p == L'\n')
+ p++;
+ end = p;
+ goto ended;
+ }
+ p++;
+ }
+ end = p;
+ ended:
+ *end = L'\0';
+ p = wbuf;
+ if ((pos = wcstombs(NULL, p, READBUF)) == -1)
+ return s + 1;
+ return s + pos;
+}
+#endif
+
+/*
+ * Return the last character that will fit on the line at col columns.
+ */
+static char *
+endline(unsigned col, char *s)
+{
+ unsigned pos = 0;
+ char *t = s;
+
+#ifdef ENABLE_WIDECHAR
+ if (MB_CUR_MAX > 1)
+ return endline_for_mb(col, s);
+#endif
+
+ while (*s != '\0') {
+ switch (*s) {
+ /*
+ * Cursor left.
+ */
+ case '\b':
+ if (pos > 0)
+ pos--;
+ break;
+ /*
+ * No cursor movement.
+ */
+ case '\a':
+ break;
+ /*
+ * Special.
+ */
+ case '\r':
+ pos = 0;
+ break;
+ case '\n':
+ t = s + 1;
+ goto cend;
+ /*
+ * Cursor right.
+ */
+ case '\t':
+ pos += TABSIZE - (pos % TABSIZE);
+ break;
+ default:
+ pos++;
+ }
+ if (pos > col) {
+ if (*s == '\t')
+ s++;
+ if (*++s == '\n')
+ s++;
+ t = s;
+ goto cend;
+ }
+ s++;
+ }
+ t = s;
+ cend:
+ return t;
+}
+
+/*
+ * Clear the current line on the terminal's screen.
+ */
+static void
+cline(void)
+{
+ char *buf = (char *)smalloc(ttycols + 2);
+ memset(buf, ' ', ttycols + 2);
+ buf[0] = '\r';
+ buf[ttycols + 1] = '\r';
+ write(1, buf, ttycols + 2);
+ free(buf);
+}
+
+/*
+ * Evaluate a command character's semantics.
+ */
+static int
+getstate(int c)
+{
+ switch (c) {
+ case '1': case '2': case '3': case '4': case '5':
+ case '6': case '7': case '8': case '9': case '0':
+ case '\0':
+ return COUNT;
+ case '-': case '+':
+ return SIGN;
+ case 'l': case 'd': case '\004': case 'f': case 'z':
+ case '.': case '\014': case '$': case 'n': case 'p':
+ case 'w': case 'h': case 'q': case 'Q':
+ return CMD_FIN;
+ case '/': case '?': case '^':
+ return SEARCH;
+ case 's': case '!':
+ return STRING;
+ case 'm': case 'b': case 't':
+ return ADDON_FIN;
+ default:
+#ifndef PGNOBELL
+ if (bell)
+ tputs(bell, 1, outcap);
+#endif /* PGNOBELL */
+ return INVALID;
+ }
+}
+
+/*
+ * Get the count and ignore last character of string.
+ */
+static int
+getcount(char *cmdstr)
+{
+ char *buf;
+ char *p;
+ int i;
+
+ if (*cmdstr == '\0')
+ return 1;
+ buf = (char *)smalloc(strlen(cmdstr) + 1);
+ strcpy(buf, cmdstr);
+ if (cmd.key != '\0') {
+ if (cmd.key == '/' || cmd.key == '?' || cmd.key == '^') {
+ if ((p = strchr(buf, cmd.key)) != NULL)
+ *p = '\0';
+ } else
+ *(buf + strlen(buf) - 1) = '\0';
+ }
+ if (*buf == '\0')
+ return 1;
+ if (buf[0] == '-' && buf[1] == '\0') {
+ i = -1;
+ } else {
+ if (*buf == '+')
+ i = atoi(buf + 1);
+ else
+ i = atoi(buf);
+ }
+ free(buf);
+ return i;
+}
+
+/*
+ * Read what the user writes at the prompt. This is tricky because
+ * we check for valid input.
+ */
+static void
+prompt(long long pageno)
+{
+ struct termios tio;
+ char key;
+ int state = COUNT;
+ int escape = 0;
+ char b[LINE_MAX], *p;
+
+ if (pageno != -1) {
+ if ((p = strstr(pstring, "%d")) == NULL) {
+ mesg(pstring);
+ } else {
+ strcpy(b, pstring);
+ sprintf(b + (p - pstring), "%lld", pageno);
+ strcat(b, p + 2);
+ mesg(b);
+ }
+ }
+ cmd.key = cmd.addon = cmd.cmdline[0] = '\0';
+ cmd.cmdlen = 0;
+ tcgetattr(1, &tio);
+ tio.c_lflag &= ~(ICANON | ECHO);
+ tio.c_cc[VMIN] = 1;
+ tio.c_cc[VTIME] = 0;
+ tcsetattr(1, TCSADRAIN, &tio);
+ tcflush(1, TCIFLUSH);
+ for (;;) {
+ switch (read(1, &key, 1)) {
+ case 0: quit(0);
+ /*NOTREACHED*/
+ case -1: quit(1);
+ }
+ if (key == tio.c_cc[VERASE]) {
+ if (cmd.cmdlen) {
+ write(1, "\b \b", 3);
+ cmd.cmdline[--cmd.cmdlen] = '\0';
+ switch (state) {
+ case ADDON_FIN:
+ state = SEARCH_FIN;
+ cmd.addon = '\0';
+ break;
+ case CMD_FIN:
+ cmd.key = '\0';
+ state = COUNT;
+ break;
+ case SEARCH_FIN:
+ state = SEARCH;
+ /*FALLTHRU*/
+ case SEARCH:
+ if (cmd.cmdline[cmd.cmdlen - 1]
+ == '\\') {
+ escape = 1;
+ while(cmd.cmdline[cmd.cmdlen
+ - escape - 1]
+ == '\\') escape++;
+ escape %= 2;
+ }
+ else {
+ escape = 0;
+ if (strchr(cmd.cmdline, cmd.key)
+ == NULL) {
+ cmd.key = '\0';
+ state = COUNT;
+ }
+ }
+ break;
+ }
+ }
+ if (cmd.cmdlen == 0) {
+ state = COUNT;
+ cmd.key = '\0';
+ }
+ continue;
+ }
+ if (key == tio.c_cc[VKILL]) {
+ cline();
+ cmd.cmdlen = 0;
+ cmd.cmdline[0] = '\0';
+ state = COUNT;
+ cmd.key = '\0';
+ continue;
+ }
+ if (key == '\n' || (nflag && state == COUNT && key == ' '))
+ break;
+ if (cmd.cmdlen >= CMDBUF - 1)
+ continue;
+ switch (state) {
+ case STRING:
+ break;
+ case SEARCH:
+ if (!escape) {
+ if (key == cmd.key)
+ state = SEARCH_FIN;
+ if (key == '\\')
+ escape = 1;
+ } else
+ escape = 0;
+ break;
+ case SEARCH_FIN:
+ if (getstate(key) != ADDON_FIN)
+ continue;
+ state = ADDON_FIN;
+ cmd.addon = key;
+ switch (key) {
+ case 't':
+ searchdisplay = TOP;
+ break;
+ case 'm':
+ searchdisplay = MIDDLE;
+ break;
+ case 'b':
+ searchdisplay = BOTTOM;
+ break;
+ }
+ break;
+ case CMD_FIN:
+ case ADDON_FIN:
+ continue;
+ default:
+ state = getstate(key);
+ switch (state) {
+ case SIGN:
+ if (cmd.cmdlen != 0) {
+ state = INVALID;
+ continue;
+ }
+ state = COUNT;
+ /*FALLTHRU*/
+ case COUNT:
+ break;
+ case ADDON_FIN:
+ case INVALID:
+ continue;
+ default:
+ cmd.key = key;
+ }
+ }
+ write(1, &key, 1);
+ cmd.cmdline[cmd.cmdlen++] = key;
+ cmd.cmdline[cmd.cmdlen] = '\0';
+ if (nflag && state == CMD_FIN)
+ goto endprompt;
+ }
+endprompt:
+ tcsetattr(1, TCSADRAIN, &otio);
+ cline();
+ cmd.count = getcount(cmd.cmdline);
+}
+
+#ifdef ENABLE_WIDECHAR
+/*
+ * Remove backspace formatting, for searches
+ * in case MB_CUR_MAX > 1.
+ */
+static char *
+colb_for_mb(char *s)
+{
+ char *p = s;
+ wchar_t *wp, *wq;
+ size_t l = strlen(s), wl;
+ unsigned i;
+
+ if ((wl = xmbstowcs(wbuf, p, sizeof wbuf)) == (size_t)-1)
+ return s;
+ for (wp = wbuf, wq = wbuf, i = 0; *wp != L'\0' && i < wl;
+ wp++, wq++) {
+ if (*wp == L'\b') {
+ if (wq != wbuf)
+ wq -= 2;
+ else
+ wq--;
+ } else
+ *wq = *wp;
+ }
+ *wq = L'\0';
+ wp = wbuf;
+ wcstombs(s, wp, l + 1);
+
+ return s;
+}
+#endif
+
+/*
+ * Remove backspace formatting, for searches.
+ */
+static char *
+colb(char *s)
+{
+ char *p = s, *q;
+
+#ifdef ENABLE_WIDECHAR
+ if (MB_CUR_MAX > 1)
+ return colb_for_mb(s);
+#endif
+
+ for (q = s; *p != '\0'; p++, q++) {
+ if (*p == '\b') {
+ if (q != s)
+ q -= 2;
+ else
+ q--;
+ } else
+ *q = *p;
+ }
+ *q = '\0';
+
+ return s;
+}
+
+#ifdef ENABLE_WIDECHAR
+/*
+ * Convert nonprintable characters to spaces
+ * in case MB_CUR_MAX > 1.
+ */
+static void
+makeprint_for_mb(char *s, size_t l)
+{
+ char *t = s;
+ wchar_t *wp = wbuf;
+ size_t wl;
+
+ if ((wl = xmbstowcs(wbuf, t, sizeof wbuf)) == (size_t)-1)
+ return;
+ while (wl--) {
+ if (!iswprint(*wp) && *wp != L'\n' && *wp != L'\r'
+ && *wp != L'\b' && *wp != L'\t')
+ *wp = L'?';
+ wp++;
+ }
+ wp = wbuf;
+ wcstombs(s, wp, l);
+}
+#endif
+
+/*
+ * Convert nonprintable characters to spaces.
+ */
+static void
+makeprint(char *s, size_t l)
+{
+#ifdef ENABLE_WIDECHAR
+ if (MB_CUR_MAX > 1)
+ return makeprint_for_mb(s, l);
+#endif
+
+ while (l--) {
+ if (!isprint(cuc(*s)) && *s != '\n' && *s != '\r'
+ && *s != '\b' && *s != '\t')
+ *s = '?';
+ s++;
+ }
+}
+
+/*
+ * Strip backslash characters from the given string.
+ */
+static void
+striprs(char *s)
+{
+ char *p = s;
+
+ do {
+ if (*s == '\\') {
+ s++;
+ }
+ *p++ = *s;
+ } while (*s++ != '\0');
+}
+
+/*
+ * Extract the search pattern off the command line.
+ */
+static char *
+makepat(void)
+{
+ char *p;
+
+ if (cmd.addon == '\0')
+ p = cmd.cmdline + strlen(cmd.cmdline) - 1;
+ else
+ p = cmd.cmdline + strlen(cmd.cmdline) - 2;
+ if (*p == cmd.key)
+ *p = '\0';
+ else
+ *(p + 1) = '\0';
+ if ((p = strchr(cmd.cmdline, cmd.key)) != NULL) {
+ p++;
+ striprs(p);
+ }
+ return p;
+}
+
+/*
+ * Process errors that occurred in temporary file operations.
+ */
+static void
+tmperr(FILE *f, char *ftype)
+{
+ if (ferror(f))
+ fprintf(stderr, _("%s: Read error from %s file\n"),
+ progname, ftype);
+ else if (feof(f))
+ /*
+ * Most likely '\0' in input.
+ */
+ fprintf(stderr, _("%s: Unexpected EOF in %s file\n"),
+ progname, ftype);
+ else
+ fprintf(stderr, _("%s: Unknown error in %s file\n"),
+ progname, ftype);
+ quit(++exitstatus);
+}
+
+/*
+ * perror()-like, but showing the program's name.
+ */
+static void
+pgerror(int eno, char *string)
+{
+ fprintf(stderr, "%s: %s: %s\n", progname, string, strerror(eno));
+}
+
+/*
+ * Read the file and respond to user input.
+ * Beware: long and ugly.
+ */
+static void
+pgfile(FILE *f, char *name)
+{
+ off_t pos, oldpos, fpos;
+ off_t line = 0, fline = 0, bline = 0, oldline = 0, eofline = 0;
+ int dline = 0;
+ /*
+ * These are the line counters:
+ * line the line desired to display
+ * fline the current line of the input file
+ * bline the current line of the file buffer
+ * oldline the line before a search was started
+ * eofline the last line of the file if it is already reached
+ * dline the line on the display
+ */
+ int search = 0;
+ unsigned searchcount = 0;
+ /*
+ * Advance to EOF immediately.
+ */
+ int seekeof = 0;
+ /*
+ * EOF has been reached by `line'.
+ */
+ int eof = 0;
+ /*
+ * f and fbuf refer to the same file.
+ */
+ int nobuf = 0;
+ int sig;
+ int rerror;
+ size_t sz;
+ char b[READBUF + 1];
+ char *p;
+ /*
+ * fbuf an exact copy of the input file as it gets read
+ * find index table for input, one entry per line
+ * save for the s command, to save to a file
+ */
+ FILE *fbuf, *find, *save;
+
+ /* silence compiler - it may warn about longjmp() */
+ CLOBBGRD(line);
+ CLOBBGRD(fline);
+ CLOBBGRD(bline);
+ CLOBBGRD(oldline);
+ CLOBBGRD(eofline);
+ CLOBBGRD(dline);
+ CLOBBGRD(ttycols);
+ CLOBBGRD(search);
+ CLOBBGRD(searchcount);
+ CLOBBGRD(seekeof);
+ CLOBBGRD(eof);
+ CLOBBGRD(fpos);
+ CLOBBGRD(nobuf);
+ CLOBBGRD(fbuf);
+
+ if (ontty == 0) {
+ /*
+ * Just copy stdin to stdout.
+ */
+ while ((sz = fread(b, sizeof *b, READBUF, f)) != 0)
+ write(1, b, sz);
+ if (ferror(f)) {
+ pgerror(errno, name);
+ exitstatus++;
+ }
+ return;
+ }
+ if ((fpos = my_fseeko(f, (off_t)0, SEEK_SET)) == -1)
+ fbuf = tmpfile();
+ else {
+ fbuf = f;
+ nobuf = 1;
+ }
+ find = tmpfile();
+ if (fbuf == NULL || find == NULL) {
+ fprintf(stderr, _("%s: Cannot create tempfile\n"), progname);
+ quit(++exitstatus);
+ }
+ if (searchfor) {
+ search = FORWARD;
+ oldline = 0;
+ searchcount = 1;
+ rerror = regcomp(&re, searchfor, REG_NOSUB | REG_NEWLINE);
+ if (rerror != 0) {
+ mesg(_("RE error: "));
+ regerror(rerror, &re, b, READBUF);
+ mesg(b);
+ goto newcmd;
+ }
+ remembered = 1;
+ }
+
+ for (line = startline; ; ) {
+ /*
+ * Get a line from input file or buffer.
+ */
+ if (line < bline) {
+ my_fseeko(find, line * sizeof pos, SEEK_SET);
+ if (fread(&pos, sizeof pos, 1, find) == 0)
+ tmperr(find, "index");
+ my_fseeko(find, (off_t)0, SEEK_END);
+ my_fseeko(fbuf, pos, SEEK_SET);
+ if (fgets(b, READBUF, fbuf) == NULL)
+ tmperr(fbuf, "buffer");
+ } else if (eofline == 0) {
+ my_fseeko(find, (off_t)0, SEEK_END);
+ do {
+ if (!nobuf)
+ my_fseeko(fbuf, (off_t)0, SEEK_END);
+ pos = my_ftello(fbuf);
+ if ((sig = setjmp(jmpenv)) != 0) {
+ /*
+ * We got a signal.
+ */
+ canjump = 0;
+ my_sigrelse(sig);
+ my_fseeko(fbuf, pos, SEEK_SET);
+ *b = '\0';
+ dline = pagelen;
+ break;
+ } else {
+ if (nobuf)
+ my_fseeko(f, fpos, SEEK_SET);
+ canjump = 1;
+ p = fgets(b, READBUF, f);
+ if (nobuf)
+ if ((fpos = my_ftello(f)) == -1)
+ pgerror(errno, name);
+ canjump = 0;
+ }
+ if (p == NULL || *b == '\0') {
+ if (ferror(f))
+ pgerror(errno, name);
+ eofline = fline;
+ eof = 1;
+ break;
+ } else {
+ if (!nobuf)
+ fputs(b, fbuf);
+ fwrite(&pos, sizeof pos, 1, find);
+ if (!fflag) {
+ oldpos = pos;
+ p = b;
+ while (*(p = endline(ttycols,
+ p))
+ != '\0') {
+ pos = oldpos + (p - b);
+ fwrite(&pos,
+ sizeof pos,
+ 1, find);
+ fline++;
+ bline++;
+ }
+ }
+ fline++;
+ }
+ } while (line > bline++);
+ } else {
+ /*
+ * eofline != 0
+ */
+ eof = 1;
+ }
+ if (search == FORWARD) {
+ if (eof) {
+ line = oldline;
+ search = searchcount = 0;
+ mesg(_("Pattern not found"));
+ eof = 0;
+ goto newcmd;
+ }
+ line++;
+ colb(b);
+ if (regexec(&re, b, 0, NULL, 0) == 0) {
+ searchcount--;
+ }
+ if (searchcount == 0) {
+ search = dline = 0;
+ switch (searchdisplay) {
+ case TOP:
+ line -= 1;
+ break;
+ case MIDDLE:
+ line -= pagelen / 2 + 1;
+ break;
+ case BOTTOM:
+ line -= pagelen;
+ break;
+ }
+ skip(1);
+ }
+ continue;
+ } else if (eof) { /*
+ * We are not searching.
+ */
+ line = bline;
+ } else if (*b != '\0') {
+ if (cflag && clear_screen) {
+ switch (dline) {
+ case 0:
+ tputs(clear_screen, 1, outcap);
+ dline = 0;
+ }
+ }
+ line++;
+ if (eofline && line == eofline)
+ eof = 1;
+ dline++;
+ if ((sig = setjmp(jmpenv)) != 0) {
+ /*
+ * We got a signal.
+ */
+ canjump = 0;
+ my_sigrelse(sig);
+ dline = pagelen;
+ } else {
+ p = endline(ttycols, b);
+ sz = p - b;
+ makeprint(b, sz);
+ canjump = 1;
+ write(1, b, sz);
+ canjump = 0;
+ }
+ }
+ if (dline >= pagelen || eof) {
+ /*
+ * Time for prompting!
+ */
+ if (eof && seekeof) {
+ eof = seekeof = 0;
+ if (line >= pagelen)
+ line -= pagelen;
+ else
+ line = 0;
+ dline = -1;
+ continue;
+ }
+newcmd:
+ if (eof) {
+ if (fline == 0 || eflag)
+ break;
+ mesg(_("(EOF)"));
+ }
+ prompt((line - 1) / pagelen + 1);
+ switch (cmd.key) {
+ case '/':
+ /*
+ * Search forward.
+ */
+ search = FORWARD;
+ oldline = line;
+ searchcount = cmd.count;
+ p = makepat();
+ if (p != NULL && *p) {
+ if (remembered == 1)
+ regfree(&re);
+ rerror = regcomp(&re, p,
+ REG_NOSUB | REG_NEWLINE);
+ if (rerror != 0) {
+ mesg(_("RE error: "));
+ sz = regerror(rerror, &re,
+ b, READBUF);
+ mesg(b);
+ goto newcmd;
+ }
+ remembered = 1;
+ } else if (remembered == 0) {
+ mesg(_("No remembered search string"));
+ goto newcmd;
+ }
+ continue;
+ case '?':
+ case '^':
+ /*
+ * Search backward.
+ */
+ search = BACKWARD;
+ oldline = line;
+ searchcount = cmd.count;
+ p = makepat();
+ if (p != NULL && *p) {
+ if (remembered == 1)
+ regfree(&re);
+ rerror = regcomp(&re, p,
+ REG_NOSUB | REG_NEWLINE);
+ if (rerror != 0) {
+ mesg("RE error: ");
+ regerror(rerror, &re,
+ b, READBUF);
+ mesg(b);
+ goto newcmd;
+ }
+ remembered = 1;
+ } else if (remembered == 0) {
+ mesg("No remembered search string");
+ goto newcmd;
+ }
+ line -= pagelen;
+ if (line <= 0)
+ goto notfound_bw;
+ while (line) {
+ my_fseeko(find, --line * sizeof pos,
+ SEEK_SET);
+ if(fread(&pos, sizeof pos, 1,find)==0)
+ tmperr(find, "index");
+ my_fseeko(find, (off_t)0, SEEK_END);
+ my_fseeko(fbuf, pos, SEEK_SET);
+ if (fgets(b, READBUF, fbuf) == NULL)
+ tmperr(fbuf, "buffer");
+ colb(b);
+ if (regexec(&re, b, 0, NULL, 0) == 0)
+ searchcount--;
+ if (searchcount == 0)
+ goto found_bw;
+ }
+notfound_bw:
+ line = oldline;
+ search = searchcount = 0;
+ mesg(_("Pattern not found"));
+ goto newcmd;
+found_bw:
+ eof = search = dline = 0;
+ skip(-1);
+ switch (searchdisplay) {
+ case TOP:
+ /* line -= 1; */
+ break;
+ case MIDDLE:
+ line -= pagelen / 2;
+ break;
+ case BOTTOM:
+ if (line != 0)
+ dline = -1;
+ line -= pagelen;
+ break;
+ }
+ if (line < 0)
+ line = 0;
+ continue;
+ case 's':
+ /*
+ * Save to file.
+ */
+ p = cmd.cmdline;
+ while (*++p == ' ');
+ if (*p == '\0')
+ goto newcmd;
+ save = fopen(p, "wb");
+ if (save == NULL) {
+ cmd.count = errno;
+ mesg(_("Cannot open "));
+ mesg(p);
+ mesg(": ");
+ mesg(strerror(cmd.count));
+ goto newcmd;
+ }
+ /*
+ * Advance to EOF.
+ */
+ my_fseeko(find, (off_t)0, SEEK_END);
+ for (;;) {
+ if (!nobuf)
+ my_fseeko(fbuf,(off_t)0,SEEK_END);
+ pos = my_ftello(fbuf);
+ if (fgets(b, READBUF, f) == NULL) {
+ eofline = fline;
+ break;
+ }
+ if (!nobuf)
+ fputs(b, fbuf);
+ fwrite(&pos, sizeof pos, 1, find);
+ if (!fflag) {
+ oldpos = pos;
+ p = b;
+ while (*(p = endline(ttycols,
+ p))
+ != '\0') {
+ pos = oldpos + (p - b);
+ fwrite(&pos,
+ sizeof pos,
+ 1, find);
+ fline++;
+ bline++;
+ }
+ }
+ fline++;
+ bline++;
+ }
+ my_fseeko(fbuf, (off_t)0, SEEK_SET);
+ while ((sz = fread(b, sizeof *b, READBUF,
+ fbuf)) != 0) {
+ /*
+ * No error check for compat.
+ */
+ fwrite(b, sizeof *b, sz, save);
+ }
+ fclose(save);
+ my_fseeko(fbuf, (off_t)0, SEEK_END);
+ mesg(_("saved"));
+ goto newcmd;
+ case 'l':
+ /*
+ * Next line.
+ */
+ if (*cmd.cmdline != 'l')
+ eof = 0;
+ if (cmd.count == 0)
+ cmd.count = 1; /* compat */
+ if (isdigit(cuc(*cmd.cmdline))) {
+ line = cmd.count - 2;
+ dline = 0;
+ } else {
+ if (cmd.count != 1) {
+ line += cmd.count - 1
+ - pagelen;
+ dline = -1;
+ skip(cmd.count);
+ }
+ /*
+ * Nothing to do if count==1.
+ */
+ }
+ break;
+ case 'd':
+ /*
+ * Half screen forward.
+ */
+ case '\004': /* ^D */
+ if (*cmd.cmdline != cmd.key)
+ eof = 0;
+ if (cmd.count == 0)
+ cmd.count = 1; /* compat */
+ line += (cmd.count * pagelen / 2)
+ - pagelen - 1;
+ dline = -1;
+ skip(cmd.count);
+ break;
+ case 'f':
+ /*
+ * Skip forward.
+ */
+ if (cmd.count <= 0)
+ cmd.count = 1; /* compat */
+ line += cmd.count * pagelen - 2;
+ if (eof)
+ line += 2;
+ if (*cmd.cmdline != 'f')
+ eof = 0;
+ else if (eof)
+ break;
+ if (eofline && line >= eofline)
+ line -= pagelen;
+ dline = -1;
+ skip(cmd.count);
+ break;
+ case '\0':
+ /*
+ * Just a number, or '-', or <newline>.
+ */
+ if (cmd.count == 0)
+ cmd.count = 1; /* compat */
+ if (isdigit(cuc(*cmd.cmdline)))
+ line = (cmd.count - 1) * pagelen - 2;
+ else
+ line += (cmd.count - 1)
+ * (pagelen - 1) - 2;
+ if (*cmd.cmdline != '\0')
+ eof = 0;
+ if (cmd.count != 1) {
+ skip(cmd.count);
+ dline = -1;
+ } else {
+ dline = 1;
+ line += 2;
+ }
+ break;
+ case '$':
+ /*
+ * Advance to EOF.
+ */
+ if (!eof)
+ skip(1);
+ eof = 0;
+ line = LONG_MAX;
+ seekeof = 1;
+ dline = -1;
+ break;
+ case '.':
+ case '\014': /* ^L */
+ /*
+ * Repaint screen.
+ */
+ eof = 0;
+ if (line >= pagelen)
+ line -= pagelen;
+ else
+ line = 0;
+ dline = 0;
+ break;
+ case '!':
+ /*
+ * Shell escape.
+ */
+ if (rflag) {
+ mesg(progname);
+ mesg(_(": !command not allowed in "
+ "rflag mode.\n"));
+ } else {
+ pid_t cpid;
+
+ write(1, cmd.cmdline,
+ strlen(cmd.cmdline));
+ write(1, "\n", 1);
+ my_sigset(SIGINT, SIG_IGN);
+ my_sigset(SIGQUIT, SIG_IGN);
+ switch (cpid = fork()) {
+ case 0:
+ p = getenv("SHELL");
+ if (p == NULL) p = "/bin/sh";
+ if (!nobuf)
+ fclose(fbuf);
+ fclose(find);
+ if (isatty(0) == 0) {
+ close(0);
+ open(tty, O_RDONLY);
+ } else {
+ fclose(f);
+ }
+ my_sigset(SIGINT, oldint);
+ my_sigset(SIGQUIT, oldquit);
+ my_sigset(SIGTERM, oldterm);
+ execl(p, p, "-c",
+ cmd.cmdline + 1, NULL);
+ pgerror(errno, p);
+ _exit(0177);
+ /*NOTREACHED*/
+ case -1:
+ mesg(_("fork() failed, "
+ "try again later\n"));
+ break;
+ default:
+ while (wait(NULL) != cpid);
+ }
+ my_sigset(SIGINT, sighandler);
+ my_sigset(SIGQUIT, sighandler);
+ mesg("!\n");
+ }
+ goto newcmd;
+ case 'h':
+ /*
+ * Help!
+ */
+ write(1, copyright + 4, strlen(copyright + 4));
+ write(1, helpscreen, strlen(helpscreen));
+ goto newcmd;
+ case 'n':
+ /*
+ * Next file.
+ */
+ if (cmd.count == 0)
+ cmd.count = 1;
+ nextfile = cmd.count;
+ if (checkf()) {
+ nextfile = 1;
+ goto newcmd;
+ }
+ eof = 1;
+ break;
+ case 'p':
+ /*
+ * Previous file.
+ */
+ if (cmd.count == 0)
+ cmd.count = 1;
+ nextfile = 0 - cmd.count;
+ if (checkf()) {
+ nextfile = 1;
+ goto newcmd;
+ }
+ eof = 1;
+ break;
+ case 'q':
+ case 'Q':
+ /*
+ * Exit pg.
+ */
+ quit(exitstatus);
+ /*NOTREACHED*/
+ case 'w':
+ case 'z':
+ /*
+ * Set window size.
+ */
+ if (cmd.count < 0)
+ cmd.count = 0;
+ if (*cmd.cmdline != cmd.key)
+ pagelen = ++cmd.count;
+ dline = 1;
+ break;
+ }
+ if (line <= 0) {
+ line = 0;
+ dline = 0;
+ }
+ if (cflag && dline == 1) {
+ dline = 0;
+ line--;
+ }
+ }
+ if (eof)
+ break;
+ }
+ fclose(find);
+ if (!nobuf)
+ fclose(fbuf);
+}
+
+int
+main(int argc, char **argv)
+{
+ int arg, i;
+ char *p;
+ FILE *input;
+
+ progname = basename(argv[0]);
+
+ setlocale(LC_MESSAGES, "");
+ bindtextdomain(PACKAGE, LOCALEDIR);
+ textdomain(PACKAGE);
+
+ if (tcgetattr(1, &otio) == 0) {
+ ontty = 1;
+ oldint = my_sigset(SIGINT, sighandler);
+ oldquit = my_sigset(SIGQUIT, sighandler);
+ oldterm = my_sigset(SIGTERM, sighandler);
+ setlocale(LC_CTYPE, "");
+ setlocale(LC_COLLATE, "");
+ tty = ttyname(1);
+ setupterm(NULL, 1, &tinfostat);
+ getwinsize();
+ helpscreen = _(helpscreen);
+ }
+ for (arg = 1; argv[arg]; arg++) {
+ if (*argv[arg] == '+')
+ continue;
+ if (*argv[arg] != '-' || argv[arg][1] == '\0')
+ break;
+ argc--;
+ for (i = 1; argv[arg][i]; i++) {
+ switch (argv[arg][i]) {
+ case '-':
+ if (i != 1 || argv[arg][i + 1])
+ invopt(&argv[arg][i]);
+ goto endargs;
+ case '1': case '2': case '3': case '4': case '5':
+ case '6': case '7': case '8': case '9': case '0':
+ pagelen = atoi(argv[arg] + i);
+ havepagelen = 1;
+ goto nextarg;
+ case 'c':
+ cflag = 1;
+ break;
+ case 'e':
+ eflag = 1;
+ break;
+ case 'f':
+ fflag = 1;
+ break;
+ case 'n':
+ nflag = 1;
+ break;
+ case 'p':
+ if (argv[arg][i + 1]) {
+ pstring = &argv[arg][i + 1];
+ } else if (argv[++arg]) {
+ --argc;
+ pstring = argv[arg];
+ } else
+ needarg("-p");
+ goto nextarg;
+ case 'r':
+ rflag = 1;
+ break;
+ case 's':
+ sflag = 1;
+ break;
+ default:
+ invopt(&argv[arg][i]);
+ }
+ }
+nextarg:
+ ;
+ }
+endargs:
+ for (arg = 1; argv[arg]; arg++) {
+ if (*argv[arg] == '-') {
+ if (argv[arg][1] == '-') {
+ arg++;
+ break;
+ }
+ if (argv[arg][1] == '\0')
+ break;
+ if (argv[arg][1] == 'p' && argv[arg][2] == '\0')
+ arg++;
+ continue;
+ }
+ if (*argv[arg] != '+')
+ break;
+ argc--;
+ switch (*(argv[arg] + 1)) {
+ case '\0':
+ needarg("+");
+ /*NOTREACHED*/
+ case '1': case '2': case '3': case '4': case '5':
+ case '6': case '7': case '8': case '9': case '0':
+ startline = atoi(argv[arg] + 1);
+ break;
+ case '/':
+ searchfor = argv[arg] + 2;
+ if (*searchfor == '\0')
+ needarg("+/");
+ p = searchfor + strlen(searchfor) - 1;
+ if (*p == '/') *p = '\0';
+ if (*searchfor == '\0')
+ needarg("+/");
+ break;
+ default:
+ invopt(argv[arg]);
+ }
+ }
+ if (argc == 1) {
+ pgfile(stdin, "stdin");
+ } else {
+ files.first = arg;
+ files.last = arg + argc - 1;
+ for ( ; argv[arg]; arg += nextfile) {
+ nextfile = 1;
+ files.current = arg;
+ if (argc > 2) {
+ static int firsttime;
+ firsttime++;
+ if (firsttime > 1) {
+ mesg(_("(Next file: "));
+ mesg(argv[arg]);
+ mesg(")");
+newfile:
+ if (ontty) {
+ prompt(-1);
+ switch(cmd.key) {
+ case 'n':
+ /*
+ * Next file.
+ */
+ if (cmd.count == 0)
+ cmd.count = 1;
+ nextfile = cmd.count;
+ if (checkf()) {
+ nextfile = 1;
+ mesg(":");
+ goto newfile;
+ }
+ continue;
+ case 'p':
+ /*
+ * Previous file.
+ */
+ if (cmd.count == 0)
+ cmd.count = 1;
+ nextfile = 0 - cmd.count;
+ if (checkf()) {
+ nextfile = 1;
+ mesg(":");
+ goto newfile;
+ }
+ continue;
+ case 'q':
+ case 'Q':
+ quit(exitstatus);
+ }
+ } else mesg("\n");
+ }
+ }
+ if (strcmp(argv[arg], "-") == 0)
+ input = stdin;
+ else {
+ input = fopen(argv[arg], "r");
+ if (input == NULL) {
+ pgerror(errno, argv[arg]);
+ exitstatus++;
+ continue;
+ }
+ }
+ if (ontty == 0 && argc > 2) {
+ /*
+ * Use the prefix as specified by SUSv2.
+ */
+ write(1, "::::::::::::::\n", 15);
+ write(1, argv[arg], strlen(argv[arg]));
+ write(1, "\n::::::::::::::\n", 16);
+ }
+ pgfile(input, argv[arg]);
+ if (input != stdin)
+ fclose(input);
+ }
+ }
+ quit(exitstatus);
+ /*NOTREACHED*/
+ return 0;
+}