From a5a16c68537f8c3e5e61c5fb1680ee9f82b70a4d Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Thu, 7 Dec 2006 00:26:08 +0100 Subject: [PATCH] Imported from util-linux-2.11y tarball. --- HISTORY | 29 +- INSTALL | 6 + MCONFIG | 7 - VERSION | 2 +- fdisk/Makefile | 2 +- fdisk/cfdisk.c | 64 +- fdisk/fdisk.c | 33 +- hwclock/rtc.c | 9 +- login-utils/login.c | 6 - login-utils/simpleinit.c | 15 + misc-utils/script.c | 22 +- misc-utils/setterm.c | 27 +- mount/Makefile | 4 +- mount/fstab.c | 39 + mount/get_label_uuid.c | 118 ++ mount/get_label_uuid.h | 1 + mount/mount.8 | 16 + mount/mount_by_label.c | 108 +- mount/mount_guess_fstype.c | 4 +- po/ca.po | 914 +++++++------- po/cat-id-tbl.c | 1203 ++++++++++--------- po/cs.po | 940 ++++++++------- po/da.po | 935 ++++++++------- po/de.po | 1061 ++++++++-------- po/es.po | 2330 +++++++++++++++++++++--------------- po/et.po | 907 +++++++------- po/fi.po | 946 ++++++++------- po/fr.po | 912 +++++++------- po/it.po | 911 +++++++------- po/ja.po | 936 ++++++++------- po/nl.po | 907 +++++++------- po/pt_BR.po | 914 +++++++------- po/sl.po | 909 +++++++------- po/sv.po | 940 ++++++++------- po/tr.po | 914 +++++++------- sys-utils/ipcs.c | 11 +- text-utils/Makefile | 11 +- text-utils/more.c | 58 +- text-utils/pg.c | 4 + 39 files changed, 9142 insertions(+), 8033 deletions(-) create mode 100644 mount/get_label_uuid.c create mode 100644 mount/get_label_uuid.h diff --git a/HISTORY b/HISTORY index 3696bf27..978a683b 100644 --- a/HISTORY +++ b/HISTORY @@ -1,9 +1,29 @@ +util-linux 2.11y + +* Danish messages (Claus Hindsgaul) +* Finnish messages (Lauri Nurmi) +* German messages (Michael Piefel) +* Spanish messages (Santiago Vila Doncel) +* Swedish messages (Christian Rose) +* cfdisk: improve escape seq recognition when compiled with slang +* fdisk: decimal units +* hwclock/rtc.c: minor cleanup (Joachim Henke) +* ipcs: compilation fix +* more: kill external help file (Joachim Henke) +* mount: fix LABEL= handling for user umount +* mount: don't abort on read error on photocds (Gyorgy Kovesdi) +* mount.8: add dmask and fmask vfat mount options +* pg: compilation fix (Joachim Henke) +* script: localized time strings (Goeran Uddeborg) +* setterm: accept devfs name (Joachim Henke) +* simpleinit: security: refuse initctl_fd if setting FD_CLOEXEC fails +* umount: allow user umount after mount by label or uuid + util-linux 2.11x * Danish messages (Claus Hindsgaul) * Dutch messages (Taco Witte) * Finnish messages (Lauri Nurmi) -* No French messages with permission to distribute (Michel Robitaille) * German messages (Michael Piefel) * Swedish messages (Christian Rose) * Turkish messages (Nilgün Belma Bugüner) @@ -36,7 +56,6 @@ util-linux 2.11v * Catalan messages (Antoni Bella Perez) * Finnish messages (Lauri Nurmi) -* No French messages with permission to distribute (Michel Robitaille) * Very few Russian messages (panivan@yandex.ru) * Slovenian messages (Primoz Peterlin) * Spanish messages (Santiago Vila Doncel) @@ -89,7 +108,6 @@ 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) @@ -116,7 +134,6 @@ util-linux 2.11s util-linux 2.11r * Estonian messages (Meelis Roos) -* No French messages with permission to distribute (Michel Robitaille) * German messages (Michael Piefel) * Spanish messages (Santiago Vila Doncel) * Swedish messages (Christian Rose) @@ -139,7 +156,6 @@ util-linux 2.11q util-linux 2.11p * Danish messages (Claus Hindsgaul) -* No French messages with permission to distribute (Michel Robitaille) * German messages (Karl Eichwalder) * Spanish messages (Santiago Vila Doncel) * Swedish messages (Christian Rose) @@ -157,7 +173,6 @@ util-linux 2.11p util-linux 2.11o * Estonian messages (Meelis Roos) -* No French messages with permission to distribute (Michel Robitaille) * Japanese messages (Daisuke Yamashita) * Spanish messages (Santiago Vila Doncel) * cal: option -s: Sunday is first day of the week @@ -184,7 +199,6 @@ util-linux 2.11o util-linux 2.11n * Danish messages (Claus Hindsgaul) -* No French messages with permission to distribute (Michel Robitaille) * German messages (Karl Eichwalder) * Swedish messages (Christian Rose) * Turkish messages now in UTF-8 (Nilgün Belma Bugüner) @@ -249,7 +263,6 @@ util-linux 2.11k util-linux 2.11j -* No French messages with permission to distribute (Michel Robitaille) * fdisk: fix for AIX label (Olaf Hering) * fdisk: fix for creating DOS label when BSD label is present * mount.8: added remark about blocksize to ext2 sb= mount option description. diff --git a/INSTALL b/INSTALL index 16dcb122..f42cbe9e 100644 --- a/INSTALL +++ b/INSTALL @@ -80,6 +80,12 @@ Warnings like from pointer target type are caused by bad ncurses or glibc header files. +Warnings like + script.c: In function `dooutput': + script.c:254: warning: `%c' yields only last 2 digits of year in some locales +are caused by a broken gcc that warns about things that are not wrong, +where the warning is not easily avoided. + All such warnings are harmless. There should be no compilation errors. diff --git a/MCONFIG b/MCONFIG index 7f7ad581..bfcaa10b 100644 --- a/MCONFIG +++ b/MCONFIG @@ -134,7 +134,6 @@ ERR_O=$(LIB)/err.o # Set HAVE_SLANG to yes if you have slang (and prefer to use that for cfdisk) # (If neither HAVE_NCURSES nor HAVE_SLANG is defined, cfdisk is not made.) # HAVE_SLANG=yes - # There is a subdirectory /usr/include/slang containing slcurses.h # SLANGFLAGS=-I/usr/include/slang # No such subdirectory - slcurses.h lives in /usr/include @@ -159,9 +158,6 @@ LOG_DIR= /var/log MAN_DIR= /usr/share/man INFO_DIR= /usr/share/info -# Directory for help file for more. Used to be /usr/lib. -MOREHELP_DIR= $(USRSHAREMISC_DIR) - # # Paths used for install # @@ -188,9 +184,6 @@ INFODIR= $(DESTDIR)$(INFO_DIR) # Directory for shutdown, halt, reboot, etc. SHUTDOWNDIR= $(SBINDIR) -# Directory for help file for more. Used to be /usr/lib. -MOREHELPDIR= $(DESTDIR)$(MOREHELP_DIR) - # Modes DIRMODE= 755 BINMODE= 755 diff --git a/VERSION b/VERSION index aa5e8ad8..91052170 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.11x +2.11y diff --git a/fdisk/Makefile b/fdisk/Makefile index 6dfaa3e8..c883b5f0 100644 --- a/fdisk/Makefile +++ b/fdisk/Makefile @@ -28,7 +28,7 @@ endif all: $(SBIN) $(NOTMADE) -cfdisk.o: cfdisk.c +cfdisk.o: cfdisk.c ../MCONFIG ifeq "$(HAVE_SLANG)" "yes" $(CC) -c $(CFLAGS) -DSLCURSES=1 $< -o $@ else diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c index 03bb3b43..6ffd80bd 100644 --- a/fdisk/cfdisk.c +++ b/fdisk/cfdisk.c @@ -107,8 +107,6 @@ extern ext2_loff_t ext2_llseek(unsigned int fd, ext2_loff_t offset, #define SECTOR_SIZE 512 -#define MAX_CYLINDERS 65535 /* there is no maximum anymore */ - /* the kernel max is 65535 */ #define MAX_HEADS 255 #define MAX_SECTORS 63 @@ -1184,60 +1182,57 @@ menuUpdate( int y, int x, struct MenuItem *menuItems, int itemLength, } /* This function takes a list of menu items, lets the user choose one * - * and returns the value keyboard shortcut of the selected menu item */ + * and returns the keyboard shortcut value of the selected menu item */ static int menuSelect( int y, int x, struct MenuItem *menuItems, int itemLength, char *available, int menuType, int menuDefault ) { int i, ylast = y, key = 0, current = menuDefault; - if( !( menuType & ( MENU_HORIZ | MENU_VERT ) ) ) - { + if( !( menuType & ( MENU_HORIZ | MENU_VERT ) ) ) { print_warning(_("Menu without direction. Defaulting horizontal.")); menuType |= MENU_HORIZ; } /* Make sure that the current is one of the available items */ - while( !strchr(available, menuItems[current].key) ) - { + while( !strchr(available, menuItems[current].key) ) { current ++ ; if( !menuItems[current].key ) current = 0; } /* Repeat until allowable choice has been made */ - while( !key ) - { - /* Display the menu */ + while( !key ) { + /* Display the menu and read a command */ ylast = menuUpdate( y, x, menuItems, itemLength, available, menuType, current ); refresh(); key = getch(); + /* Clear out all prompts and such */ clear_warning(); - for( i = y; i < ylast; i ++ ) - { - move( i, x ); + for (i = y; i < ylast; i++) { + move(i, x); clrtoeol(); } move( WARNING_START + 1, 0 ); clrtoeol(); - /* Cursor keys */ - if( key == ESC ) - { + + /* Cursor keys - possibly split by slow connection */ + if( key == ESC ) { /* Check whether this is a real ESC or one of extended keys */ /*nodelay(stdscr, TRUE);*/ key = getch(); /*nodelay(stdscr, FALSE);*/ - if( key == /*ERR*/ ESC ) - { + + if( key == /*ERR*/ ESC ) { /* This is a real ESC */ key = ESC; } - if( key == '[' ) - { + if(key == '[' || key == 'O') { /* This is one extended keys */ - switch( getch() ) - { + key = getch(); + + switch(key) { case 'A': /* Up arrow */ key = MENU_UP; break; @@ -1250,21 +1245,23 @@ menuSelect( int y, int x, struct MenuItem *menuItems, int itemLength, case 'D': /* Left arrow */ key = MENU_LEFT; break; + default: + key = 0; } } } - /* Enter equals to the keyboard shortcut of current menu item */ - if( key == CR) + /* Enter equals the keyboard shortcut of current menu item */ + if (key == CR) key = menuItems[current].key; /* Give alternatives for arrow keys in case the window manager swallows these */ - if ( key == TAB ) + if (key == TAB) key = MENU_RIGHT; - if ( key == UPKEY ) /* ^P */ + if (key == UPKEY) /* ^P */ key = MENU_UP; - if ( key == DOWNKEY ) /* ^N */ + if (key == DOWNKEY) /* ^N */ key = MENU_DOWN; if (key == MENU_UP) { @@ -1315,21 +1312,22 @@ menuSelect( int y, int x, struct MenuItem *menuItems, int itemLength, /* Should all keys to be accepted? */ if( key && (menuType & MENU_ACCEPT_OTHERS) ) break; - /* Is pressed key among acceptable ones */ + + /* Is pressed key among acceptable ones? */ if( key && (strchr(available, tolower(key)) || strchr(available, key))) break; + /* The key has not been accepted so far -> let's reject it */ - if( key ) - { + if (key) { key = 0; putchar( BELL ); print_warning(_("Illegal key")); } } + /* Clear out prompts and such */ clear_warning(); - for( i = y; i <= ylast; i ++ ) - { + for( i = y; i <= ylast; i ++ ) { move( i, x ); clrtoeol(); } @@ -2820,7 +2818,7 @@ do_curses_fdisk(void) { static void copyright(void) { - fprintf(stderr, _("Copyright (C) 1994-2000 Kevin E. Martin & aeb\n")); + fprintf(stderr, _("Copyright (C) 1994-2002 Kevin E. Martin & aeb\n")); } static void diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c index 5ad15d9f..32b6bc39 100644 --- a/fdisk/fdisk.c +++ b/fdisk/fdisk.c @@ -1081,11 +1081,14 @@ read_int(uint low, uint dflt, uint high, uint base, char *mesg) continue; if (*line_ptr == '+' || *line_ptr == '-') { + int minus = (*line_ptr == '-'); + int absolute = 0; + i = atoi(line_ptr+1); - if (*line_ptr == '-') - i = -i; + while (isdigit(*++line_ptr)) use_default = 0; + switch (*line_ptr) { case 'c': case 'C': @@ -1094,25 +1097,31 @@ read_int(uint low, uint dflt, uint high, uint base, char *mesg) break; case 'k': case 'K': - i *= 2; - i /= (sector_size / 512); - i /= units_per_sector; + absolute = 1000; break; case 'm': case 'M': - i *= 2048; - i /= (sector_size / 512); - i /= units_per_sector; + absolute = 1000000; break; case 'g': case 'G': - i *= 2048000; - i /= (sector_size / 512); - i /= units_per_sector; + absolute = 1000000000; break; default: break; } + if (absolute) { + unsigned long long bytes; + unsigned long unit; + + bytes = (unsigned long long) i * absolute; + unit = sector_size * units_per_sector; + bytes += unit/2; /* round */ + bytes /= unit; + i = bytes; + } + if (minus) + i = -i; i += base; } else { i = atoi(line_ptr); @@ -1457,7 +1466,7 @@ static void check_consistency(struct partition *p, int partition) { /* Ending on cylinder boundary? */ if (peh != (heads - 1) || pes != sectors) { - printf(_("Partition %i does not end on cylinder boundary:\n"), + printf(_("Partition %i does not end on cylinder boundary.\n"), partition + 1); #if 0 printf(_(" phys=(%d, %d, %d) "), pec, peh, pes); diff --git a/hwclock/rtc.c b/hwclock/rtc.c index 98d1ef9c..b13a46a8 100644 --- a/hwclock/rtc.c +++ b/hwclock/rtc.c @@ -89,20 +89,19 @@ struct linux_rtc_time { #define RTC_DEVN "rtc" #endif -static char rtc_dev_name[40]; +static char *rtc_dev_name; -/* 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_dev_name = "/dev/" RTC_DEVN; rtc_fd = open(rtc_dev_name, O_RDONLY); if (rtc_fd < 0 && errno == ENOENT) { - sprintf(rtc_dev_name, "/dev/misc/%s", RTC_DEVN); + rtc_dev_name = "/dev/misc/" RTC_DEVN; rtc_fd = open(rtc_dev_name, O_RDONLY); if (rtc_fd < 0 && errno == ENOENT) - sprintf(rtc_dev_name, "/dev/%s", RTC_DEVN); + rtc_dev_name = "/dev/" RTC_DEVN; } return rtc_fd; } diff --git a/login-utils/login.c b/login-utils/login.c index 0ec16ad5..8088878a 100644 --- a/login-utils/login.c +++ b/login-utils/login.c @@ -201,7 +201,6 @@ int kerror = KSUCCESS, notickets = 1; #endif #define TTYGRPNAME "tty" /* name of group to own ttys */ -/**# define TTYGRPNAME "other" **/ #ifndef MAXPATHLEN # define MAXPATHLEN 1024 @@ -238,11 +237,6 @@ struct ltchars ltc = { }; #endif -const char *months[] = { - "Jan", "Feb", "Mar", "Apr", "May", "Jun", - "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" -}; - /* Nice and simple code provided by Linus Torvalds 16-Feb-93 */ /* Nonblocking stuff by Maciej W. Rozycki, macro@ds2.pg.gda.pl, 1999. He writes: "Login performs open() on a tty in a blocking mode. diff --git a/login-utils/simpleinit.c b/login-utils/simpleinit.c index cf33fe14..093c0030 100644 --- a/login-utils/simpleinit.c +++ b/login-utils/simpleinit.c @@ -13,6 +13,8 @@ * - block signals in handlers, so that longjmp() doesn't kill context * 2001-02-25 Richard Gooch * - make default INIT_PATH the boot_prog (if it is a directory) - YECCH + * 2002-11-20 patch from SuSE + * - refuse initctl_fd if setting FD_CLOEXEC fails */ #include @@ -204,6 +206,19 @@ int main(int argc, char *argv[]) err ( _("error opening fifo\n") ); } + if (initctl_fd >= 0 && fcntl(initctl_fd, F_SETFD, FD_CLOEXEC) != 0) { + err ( _("error setting close-on-exec on /dev/initctl") ); + + /* Can the fcntl ever fail? If it does, and we leave + the descriptor open in child processes, then any + process on the system will be able to write to + /dev/initctl and have us execute arbitrary commands + as root. So let's refuse to use the fifo in this case. */ + + close(initctl_fd); + initctl_fd = -1; + } + if ( want_single || (access (_PATH_SINGLE, R_OK) == 0) ) do_single (); /*If we get a SIGTSTP before multi-user mode, do nothing*/ diff --git a/misc-utils/script.c b/misc-utils/script.c index a5d0c663..ec98ea1a 100644 --- a/misc-utils/script.c +++ b/misc-utils/script.c @@ -238,6 +238,15 @@ resize(int dummy) { kill(child, SIGWINCH); } +/* + * Stop extremely silly gcc complaint on %c: + * warning: `%c' yields only last 2 digits of year in some locales + */ +static void +my_strftime(char *buf, size_t len, const char *fmt, const struct tm *tm) { + strftime(buf, len, fmt, tm); +} + void dooutput() { register int cc; @@ -251,7 +260,9 @@ dooutput() { (void) close(slave); #endif tvec = time((time_t *)NULL); - fprintf(fscript, _("Script started on %s"), ctime(&tvec)); + my_strftime(obuf, sizeof obuf, "%c\n", localtime(&tvec)); + fprintf(fscript, _("Script started on %s"), obuf); + for (;;) { if (tflg) gettimeofday(&tv, NULL); @@ -259,9 +270,9 @@ dooutput() { if (cc <= 0) break; if (tflg) { - newtime=tv.tv_sec + (double) tv.tv_usec / 1000000; + newtime = tv.tv_sec + (double) tv.tv_usec / 1000000; fprintf(stderr, "%f %i\n", newtime - oldtime, cc); - oldtime=newtime; + oldtime = newtime; } (void) write(1, obuf, cc); (void) fwrite(obuf, 1, cc, fscript); @@ -321,9 +332,10 @@ done() { if (subchild) { if (!qflg) { + char buf[BUFSIZ]; tvec = time((time_t *)NULL); - fprintf(fscript, _("\nScript done on %s"), - ctime(&tvec)); + my_strftime(buf, sizeof buf, "%c\n", localtime(&tvec)); + fprintf(fscript, _("\nScript done on %s"), buf); } (void) fclose(fscript); (void) close(master); diff --git a/misc-utils/setterm.c b/misc-utils/setterm.c index 24fb90d8..7d105721 100644 --- a/misc-utils/setterm.c +++ b/misc-utils/setterm.c @@ -107,6 +107,7 @@ #else #include #endif +#include /* for MAXPATHLEN */ #include #include #include "nls.h" @@ -184,7 +185,7 @@ int opt_cl_all; /* Clear all or rest. */ int opt_bl_min; /* Blank screen. */ int opt_blength_l; int opt_bfreq_f; -int opt_sn_num = 0; /* Snap screen. */ +int opt_sn_num; /* Snap screen. */ int opt_st_attr; int opt_rt_len; /* regular tab length */ int opt_tb_array[161]; /* Array for tab list */ @@ -1109,7 +1110,6 @@ perform_sequence(int vcterm) { static void screendump(int vcnum, FILE *F) { -#include char infile[MAXPATHLEN]; unsigned char header[4]; unsigned int rows, cols; @@ -1117,13 +1117,28 @@ screendump(int vcnum, FILE *F) { char *inbuf, *outbuf, *p, *q; sprintf(infile, "/dev/vcsa%d", vcnum); - fd = open(infile, 0); - if (fd < 0 || read(fd, header, 4) != 4) - goto try_ioctl; + fd = open(infile, O_RDONLY); + if (fd < 0 && vcnum == 0) { + /* vcsa0 is often called vcsa */ + sprintf(infile, "/dev/vcsa"); + fd = open(infile, O_RDONLY); + } + if (fd < 0) { + /* try devfs name - for zero vcnum just /dev/vcc/a */ + /* some gcc's warn for %.u - add 0 */ + sprintf(infile, "/dev/vcc/a%.0u", vcnum); + fd = open(infile, O_RDONLY); + } + if (fd < 0) { + sprintf(infile, "/dev/vcsa%d", vcnum); + goto try_ioctl; + } + if (read(fd, header, 4) != 4) + goto try_ioctl; rows = header[0]; cols = header[1]; if (rows * cols == 0) - goto try_ioctl; + goto try_ioctl; inbuf = malloc(rows*cols*2); outbuf = malloc(rows*(cols+1)); if(!inbuf || !outbuf) { diff --git a/mount/Makefile b/mount/Makefile index 52c4cff6..5e5ca58a 100644 --- a/mount/Makefile +++ b/mount/Makefile @@ -43,12 +43,12 @@ install: $(PROGS) $(COMPILE) $< mount: mount.o fstab.o sundries.o realpath.o mntent.o version.o \ - mount_guess_fstype.o mount_by_label.o getusername.o \ + mount_guess_fstype.o get_label_uuid.o mount_by_label.o getusername.o \ $(LIB)/setproctitle.o $(LIB)/env.o $(NFS_OBJS) $(LO_OBJS) $(LINK) $^ -o $@ umount: umount.o fstab.o sundries.o realpath.o mntent.o getusername.o \ - version.o $(LIB)/env.o $(LO_OBJS) + get_label_uuid.o version.o $(LIB)/env.o $(LO_OBJS) $(LINK) $^ -o $@ swapon: swapon.o version.o diff --git a/mount/fstab.c b/mount/fstab.c index 3e314223..408042c1 100644 --- a/mount/fstab.c +++ b/mount/fstab.c @@ -12,6 +12,7 @@ #include "mntent.h" #include "fstab.h" #include "sundries.h" /* for xmalloc() etc */ +#include "get_label_uuid.h" #include "nls.h" #define streq(s, t) (strcmp ((s), (t)) == 0) @@ -223,22 +224,60 @@ getmntoptfile (const char *file) { return NULL; } +static int +has_label(const char *device, const char *label) { + char devuuid[16]; + char *devlabel; + + return !get_label_uuid(device, &devlabel, devuuid) && + !strcmp(label, devlabel); +} + +static int +has_uuid(const char *device, const char *uuid){ + char devuuid[16]; + char *devlabel; + + return !get_label_uuid(device, &devlabel, devuuid) && + !memcmp(uuid, devuuid, sizeof(devuuid)); +} + /* Find the entry (SPEC,FILE) in fstab */ struct mntentchn * getfsspecfile (const char *spec, const char *file) { struct mntentchn *mc, *mc0; mc0 = fstab_head(); + + /* first attempt: names occur precisely as given */ for (mc = mc0->nxt; mc && mc != mc0; mc = mc->nxt) if (streq (mc->m.mnt_dir, file) && streq (mc->m.mnt_fsname, spec)) return mc; + + /* second attempt: names found after symlink resolution */ for (mc = mc0->nxt; mc && mc != mc0; mc = mc->nxt) if ((streq (mc->m.mnt_dir, file) || streq (canonicalize(mc->m.mnt_dir), file)) && (streq (mc->m.mnt_fsname, spec) || streq (canonicalize(mc->m.mnt_fsname), spec))) return mc; + + /* third attempt: names found after LABEL= or UUID= resolution */ + for (mc = mc0->nxt; mc && mc != mc0; mc = mc->nxt) { + if (!strncmp (mc->m.mnt_fsname, "LABEL=", 6) && + (streq (mc->m.mnt_dir, file) || + streq (canonicalize(mc->m.mnt_dir), file))) { + if (has_label(spec, mc->m.mnt_fsname+6)) + return mc; + } + if (!strncmp (mc->m.mnt_fsname, "UUID=", 5) && + (streq (mc->m.mnt_dir, file) || + streq (canonicalize(mc->m.mnt_dir), file))) { + if (has_uuid(spec, mc->m.mnt_fsname+5)) + return mc; + } + } return NULL; } diff --git a/mount/get_label_uuid.c b/mount/get_label_uuid.c new file mode 100644 index 00000000..310de6dc --- /dev/null +++ b/mount/get_label_uuid.c @@ -0,0 +1,118 @@ +/* + * Get label. Used by both mount and umount. + */ +#include +#include +#include +#include +#include + +#include "linux_fs.h" +#include "get_label_uuid.h" + +/* + * 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. + * + * For the moment this test is switched off - it causes problems. + * "Checking for a disk label should only be done on the full raid, + * not on the disks that form the raid array. This test causes a lot of + * problems when run on my striped promise fasttrak 100 array." + */ +static inline int +is_raid_partition(int fd) { +#if 0 + 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); +#else + return 0; +#endif +} + +/* for now, only ext2, ext3, xfs, ocfs are supported */ +int +get_label_uuid(const char *device, char **label, char *uuid) { + int fd; + int rv = 1; + size_t namesize; + struct ext2_super_block e2sb; + struct xfs_super_block xfsb; + struct jfs_super_block jfssb; + struct ocfs_volume_header ovh; /* Oracle */ + struct ocfs_volume_label olbl; + + fd = open(device, O_RDONLY); + 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)) { + memcpy(uuid, e2sb.s_uuid, sizeof(e2sb.s_uuid)); + namesize = sizeof(e2sb.s_volume_name); + if ((*label = calloc(namesize + 1, 1)) != NULL) + memcpy(*label, e2sb.s_volume_name, namesize); + rv = 0; + } + else if (lseek(fd, 0, SEEK_SET) == 0 + && read(fd, (char *) &xfsb, sizeof(xfsb)) == sizeof(xfsb) + && (strncmp(xfsb.s_magic, XFS_SUPER_MAGIC, 4) == 0)) { + memcpy(uuid, xfsb.s_uuid, sizeof(xfsb.s_uuid)); + namesize = sizeof(xfsb.s_fname); + if ((*label = calloc(namesize + 1, 1)) != NULL) + memcpy(*label, xfsb.s_fname, namesize); + rv = 0; + } + else if (lseek(fd, 0, SEEK_SET) == 0 + && read(fd, (char *) &ovh, sizeof(ovh)) == sizeof(ovh) + && (strncmp(ovh.signature, OCFS_MAGIC, sizeof(OCFS_MAGIC)) == 0) + && (lseek(fd, 512, SEEK_SET) == 512) + && read(fd, (char *) &olbl, sizeof(olbl)) == sizeof(olbl)) { + uuid[0] = '\0'; + namesize = ocfslabellen(olbl); + if ((*label = calloc(namesize + 1, 1)) != NULL) + memcpy(*label, olbl.label, namesize); + rv = 0; + } + else if (lseek(fd, JFS_SUPER1_OFF, SEEK_SET) == JFS_SUPER1_OFF + && read(fd, (char *) &jfssb, sizeof(jfssb)) == sizeof(jfssb) + && (strncmp(jfssb.s_magic, JFS_MAGIC, 4) == 0)) { + if (assemble4le(jfssb.s_version) == 1) { + /* old (OS/2 compatible) jfs filesystems don't + have UUIDs and only have a very small label. */ + memset(uuid, 0, 16); + namesize = sizeof(jfssb.s_fpack); + if ((*label = calloc(namesize + 1, 1)) != NULL) + memcpy(*label, jfssb.s_fpack, namesize); + } else { + memcpy(uuid, jfssb.s_uuid, sizeof(jfssb.s_uuid)); + namesize = sizeof(jfssb.s_label); + if ((*label = calloc(namesize + 1, 1)) != NULL) + memcpy(*label, jfssb.s_label, namesize); + } + rv = 0; + } + + close(fd); + return rv; +} diff --git a/mount/get_label_uuid.h b/mount/get_label_uuid.h new file mode 100644 index 00000000..f52cc521 --- /dev/null +++ b/mount/get_label_uuid.h @@ -0,0 +1 @@ +int get_label_uuid(const char *device, char **label, char *uuid); diff --git a/mount/mount.8 b/mount/mount.8 index ed2b41f8..32a5e850 100644 --- a/mount/mount.8 +++ b/mount/mount.8 @@ -362,6 +362,7 @@ currently supported are: .IR ntfs , .IR proc , .IR qnx4 , +.IR ramfs , .IR reiserfs , .IR romfs , .IR smbfs , @@ -894,6 +895,16 @@ Set the umask (the bitmask of the permissions that are present). The default is the umask of the current process. The value is given in octal. .TP +.BI dmask= value +Set the umask applied to directories only. +The default is the umask of the current process. +The value is given in octal. Present since 2.5.43. +.TP +.BI fmask= value +Set the umask applied to regular files only. +The default is the umask of the current process. +The value is given in octal. Present since 2.5.43. +.TP .BI check= value Three different levels of pickyness can be chosen: .RS @@ -1241,6 +1252,11 @@ By default, the files are owned by root and not readable by somebody else. \fBuid=\fP\fIvalue\fP and \fBgid=\fP\fIvalue\fP These options are recognized, but have no effect as far as I can see. +.SH "Mount options for ramfs" +Ramfs is a memory based filesystem. Mount it and you have it. Unmount it +and it is gone. Present since Linux 2.3.99pre4. +There are no mount options. + .SH "Mount options for reiserfs" Reiserfs is a journaling filesystem. The reiserfs mount options are more fully described at diff --git a/mount/mount_by_label.c b/mount/mount_by_label.c index 10c91667..e2afcf01 100644 --- a/mount/mount_by_label.c +++ b/mount/mount_by_label.c @@ -29,6 +29,7 @@ #include #include "sundries.h" /* for xstrdup */ #include "linux_fs.h" +#include "get_label_uuid.h" #include "mount_by_label.h" #include "nls.h" @@ -45,113 +46,6 @@ 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. - * - * For the moment this test is switched off - it causes problems. - * "Checking for a disk label should only be done on the full raid, - * not on the disks that form the raid array. This test causes a lot of - * problems when run on my striped promise fasttrak 100 array." - */ -static int -is_raid_partition(int fd) { -#if 0 - 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); -#else - return 0; -#endif -} - -/* for now, only ext2, ext3, xfs, ocfs are supported */ -static int -get_label_uuid(const char *device, char **label, char *uuid) { - int fd; - int rv = 1; - size_t namesize; - struct ext2_super_block e2sb; - struct xfs_super_block xfsb; - struct jfs_super_block jfssb; - struct ocfs_volume_header ovh; /* Oracle */ - struct ocfs_volume_label olbl; - - fd = open(device, O_RDONLY); - 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)) { - memcpy(uuid, e2sb.s_uuid, sizeof(e2sb.s_uuid)); - namesize = sizeof(e2sb.s_volume_name); - if ((*label = calloc(namesize + 1, 1)) != NULL) - memcpy(*label, e2sb.s_volume_name, namesize); - rv = 0; - } - else if (lseek(fd, 0, SEEK_SET) == 0 - && read(fd, (char *) &xfsb, sizeof(xfsb)) == sizeof(xfsb) - && (strncmp(xfsb.s_magic, XFS_SUPER_MAGIC, 4) == 0)) { - memcpy(uuid, xfsb.s_uuid, sizeof(xfsb.s_uuid)); - namesize = sizeof(xfsb.s_fname); - if ((*label = calloc(namesize + 1, 1)) != NULL) - memcpy(*label, xfsb.s_fname, namesize); - rv = 0; - } - else if (lseek(fd, 0, SEEK_SET) == 0 - && read(fd, (char *) &ovh, sizeof(ovh)) == sizeof(ovh) - && (strncmp(ovh.signature, OCFS_MAGIC, sizeof(OCFS_MAGIC)) == 0) - && (lseek(fd, 512, SEEK_SET) == 512) - && read(fd, (char *) &olbl, sizeof(olbl)) == sizeof(olbl)) { - uuid[0] = '\0'; - namesize = ocfslabellen(olbl); - if ((*label = calloc(namesize + 1, 1)) != NULL) - memcpy(*label, olbl.label, namesize); - rv = 0; - } - else if (lseek(fd, JFS_SUPER1_OFF, SEEK_SET) == JFS_SUPER1_OFF - && read(fd, (char *) &jfssb, sizeof(jfssb)) == sizeof(jfssb) - && (strncmp(jfssb.s_magic, JFS_MAGIC, 4) == 0)) { - if (assemble4le(jfssb.s_version) == 1) { - /* old (OS/2 compatible) jfs filesystems don't - have UUIDs and only have a very small label. */ - memset(uuid, 0, 16); - namesize = sizeof(jfssb.s_fpack); - if ((*label = calloc(namesize + 1, 1)) != NULL) - memcpy(*label, jfssb.s_fpack, namesize); - } else { - memcpy(uuid, jfssb.s_uuid, sizeof(jfssb.s_uuid)); - namesize = sizeof(jfssb.s_label); - if ((*label = calloc(namesize + 1, 1)) != NULL) - memcpy(*label, jfssb.s_label, namesize); - } - rv = 0; - } - - close(fd); - return rv; -} - static void uuidcache_addentry(char *device, char *label, char *uuid) { struct uuidCache_s *last; diff --git a/mount/mount_guess_fstype.c b/mount/mount_guess_fstype.c index a096a262..96b14d71 100644 --- a/mount/mount_guess_fstype.c +++ b/mount/mount_guess_fstype.c @@ -275,7 +275,8 @@ do_guess_fstype(const char *device) { /* block 0 */ if (lseek(fd, 0, SEEK_SET) != 0 || read(fd, (char *) &xsb, sizeof(xsb)) != sizeof(xsb)) - goto io_error; + goto try_iso9660; + /* Gyorgy Kovesdi: none of my photocds has a readable block 0 */ if (xiafsmagic(xsb.xiasb) == _XIAFS_SUPER_MAGIC) type = "xiafs"; @@ -426,6 +427,7 @@ do_guess_fstype(const char *device) { if (!type) { /* block 32 */ + try_iso9660: if (lseek(fd, 0x8000, SEEK_SET) != 0x8000 || read(fd, (char *) &isosb, sizeof(isosb)) != sizeof(isosb)) goto io_error; diff --git a/po/ca.po b/po/ca.po index 6e4a91f6..78b41aeb 100644 --- a/po/ca.po +++ b/po/ca.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: util-linux-2.11u\n" -"POT-Creation-Date: 2002-11-02 16:45+0100\n" +"POT-Creation-Date: 2002-11-25 00:47+0100\n" "PO-Revision-Date: 2002-09-12 00:59+0200\n" "Last-Translator: Antoni Bella Perez \n" "Language-Team: Catalan \n" @@ -762,7 +762,7 @@ msgstr "masses ínodes; el màxim és de 512" msgid "not enough space, need at least %lu blocks" msgstr "no hi ha prou espai, com a mínim es necessiten %lu blocs" -#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2157 +#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2166 #, c-format msgid "Device: %s\n" msgstr "Dispositiu: %s\n" @@ -837,7 +837,7 @@ msgstr "" "Useu: mkfs [-V] [-t tipus_sis._fitx.] [opcions_sis._fitx.] dispositiu " "[mida]\n" -#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:372 getopt-1.1.2/getopt.c:89 +#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:370 getopt-1.1.2/getopt.c:89 #: getopt-1.1.2/getopt.c:99 login-utils/wall.c:237 #, c-format msgid "%s: Out of memory!\n" @@ -1146,7 +1146,7 @@ msgid "too many bad pages" msgstr "hi han masses pàgines incorrectes" #: disk-utils/mkswap.c:363 misc-utils/look.c:182 misc-utils/setterm.c:1130 -#: text-utils/more.c:2061 text-utils/more.c:2072 +#: text-utils/more.c:2065 text-utils/more.c:2076 msgid "Out of memory" msgstr "Memòria esgotada" @@ -1265,58 +1265,58 @@ msgstr " %s [ -c | -y | -n | -d ] dispositiu\n" msgid " %s [ -c | -y | -n ] dev\n" msgstr " %s [ -c | -y | -n ] dispositiu\n" -#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:1995 +#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:2003 msgid "Unusable" msgstr "Inutilitzable" -#: fdisk/cfdisk.c:399 fdisk/cfdisk.c:1997 +#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:2005 msgid "Free Space" msgstr "Espai lliure" -#: fdisk/cfdisk.c:402 +#: fdisk/cfdisk.c:400 msgid "Linux ext2" msgstr "Linux ext2" -#: fdisk/cfdisk.c:404 +#: fdisk/cfdisk.c:402 msgid "Linux ext3" msgstr "Linux ext3" -#: fdisk/cfdisk.c:406 +#: fdisk/cfdisk.c:404 msgid "Linux XFS" msgstr "Linux XFS" -#: fdisk/cfdisk.c:408 +#: fdisk/cfdisk.c:406 msgid "Linux ReiserFS" msgstr "Linux ReiserFS" #. also Solaris -#: fdisk/cfdisk.c:410 fdisk/i386_sys_types.c:57 +#: fdisk/cfdisk.c:408 fdisk/i386_sys_types.c:57 msgid "Linux" msgstr "Linux" -#: fdisk/cfdisk.c:413 +#: fdisk/cfdisk.c:411 msgid "OS/2 HPFS" msgstr "OS/2 HPFS" -#: fdisk/cfdisk.c:415 +#: fdisk/cfdisk.c:413 msgid "OS/2 IFS" msgstr "OS/2 IFS" -#: fdisk/cfdisk.c:419 +#: fdisk/cfdisk.c:417 msgid "NTFS" msgstr "NTFS" -#: fdisk/cfdisk.c:430 +#: fdisk/cfdisk.c:428 msgid "Disk has been changed.\n" msgstr "S'ha modificat el disc.\n" -#: fdisk/cfdisk.c:431 +#: fdisk/cfdisk.c:429 msgid "Reboot the system to ensure the partition table is correctly updated.\n" msgstr "" "Reinicieu el sistema per a assegurar-vos de que la taula de particions ha " "estat actualitzada correctament.\n" -#: fdisk/cfdisk.c:434 +#: fdisk/cfdisk.c:432 msgid "" "\n" "WARNING: If you have created or modified any\n" @@ -1328,310 +1328,310 @@ msgstr "" "particions de DOS 6.x, si us plau consulteu la pàgina\n" "del manual de cfdis per a informació addicional.\n" -#: fdisk/cfdisk.c:529 +#: fdisk/cfdisk.c:527 msgid "FATAL ERROR" msgstr "ERROR FATAL" -#: fdisk/cfdisk.c:530 +#: fdisk/cfdisk.c:528 msgid "Press any key to exit cfdisk" msgstr "Premeu una tecla per a sortir de cfdisk" -#: fdisk/cfdisk.c:577 fdisk/cfdisk.c:585 +#: fdisk/cfdisk.c:575 fdisk/cfdisk.c:583 msgid "Cannot seek on disk drive" msgstr "Error accedint a la unitat de disc" -#: fdisk/cfdisk.c:579 +#: fdisk/cfdisk.c:577 msgid "Cannot read disk drive" msgstr "No es pot llegir la unitat de disc" -#: fdisk/cfdisk.c:587 +#: fdisk/cfdisk.c:585 msgid "Cannot write disk drive" msgstr "No es pot escriure en la unitat de disc" -#: fdisk/cfdisk.c:887 +#: fdisk/cfdisk.c:885 msgid "Too many partitions" msgstr "Hi han masses particions" -#: fdisk/cfdisk.c:892 +#: fdisk/cfdisk.c:890 msgid "Partition begins before sector 0" msgstr "La partició comença abans del sector 0" -#: fdisk/cfdisk.c:897 +#: fdisk/cfdisk.c:895 msgid "Partition ends before sector 0" msgstr "La partició acaba abans del sector 0" -#: fdisk/cfdisk.c:902 +#: fdisk/cfdisk.c:900 msgid "Partition begins after end-of-disk" msgstr "La partició comença despres de la fí del disc" -#: fdisk/cfdisk.c:907 +#: fdisk/cfdisk.c:905 msgid "Partition ends after end-of-disk" msgstr "La partició acaba despres de la fí del disc" -#: fdisk/cfdisk.c:912 +#: fdisk/cfdisk.c:910 msgid "Partition ends in the final partial cylinder" msgstr "" -#: fdisk/cfdisk.c:936 +#: fdisk/cfdisk.c:934 msgid "logical partitions not in disk order" msgstr "les particions lògiques no estan en un ordre de disc" -#: fdisk/cfdisk.c:939 +#: fdisk/cfdisk.c:937 msgid "logical partitions overlap" msgstr "solapament de particions lògiques" -#: fdisk/cfdisk.c:941 +#: fdisk/cfdisk.c:939 msgid "enlarged logical partitions overlap" msgstr "solapament de les particions lògiques ampliades" -#: fdisk/cfdisk.c:971 +#: fdisk/cfdisk.c:969 msgid "" "!!!! Internal error creating logical drive with no extended partition !!!!" msgstr "" "!!!! Error intern al crear una unitat lògica sense partició estesa !!!!" -#: fdisk/cfdisk.c:982 fdisk/cfdisk.c:994 +#: fdisk/cfdisk.c:980 fdisk/cfdisk.c:992 msgid "" "Cannot create logical drive here -- would create two extended partitions" msgstr "" "No es pot crear una unitat lògica aquí; es crearan dos particions esteses" -#: fdisk/cfdisk.c:1142 +#: fdisk/cfdisk.c:1140 msgid "Menu item too long. Menu may look odd." msgstr "Ítem del menú massa llarg; l'aspecte del menú pot ser estrany." -#: fdisk/cfdisk.c:1196 +#: fdisk/cfdisk.c:1193 msgid "Menu without direction. Defaulting horizontal." msgstr "Menú sense direcció; l'opció per defecte és horitzontal." -#: fdisk/cfdisk.c:1326 +#: fdisk/cfdisk.c:1334 msgid "Illegal key" msgstr "Tecla no permesa" -#: fdisk/cfdisk.c:1349 +#: fdisk/cfdisk.c:1357 msgid "Press a key to continue" msgstr "Premeu una tecla per a continuar" -#: fdisk/cfdisk.c:1396 fdisk/cfdisk.c:1966 fdisk/cfdisk.c:2497 -#: fdisk/cfdisk.c:2499 +#: fdisk/cfdisk.c:1404 fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2505 +#: fdisk/cfdisk.c:2507 msgid "Primary" msgstr "Primària" -#: fdisk/cfdisk.c:1396 +#: fdisk/cfdisk.c:1404 msgid "Create a new primary partition" msgstr "Crear una nova partició primària" -#: fdisk/cfdisk.c:1397 fdisk/cfdisk.c:1966 fdisk/cfdisk.c:2496 -#: fdisk/cfdisk.c:2499 +#: fdisk/cfdisk.c:1405 fdisk/cfdisk.c:1974 fdisk/cfdisk.c:2504 +#: fdisk/cfdisk.c:2507 msgid "Logical" msgstr "Lògica" -#: fdisk/cfdisk.c:1397 +#: fdisk/cfdisk.c:1405 msgid "Create a new logical partition" msgstr "Crear una nova partició lògica" -#: fdisk/cfdisk.c:1398 fdisk/cfdisk.c:1453 fdisk/cfdisk.c:2171 +#: fdisk/cfdisk.c:1406 fdisk/cfdisk.c:1461 fdisk/cfdisk.c:2179 msgid "Cancel" msgstr "Cancel·lar" -#: fdisk/cfdisk.c:1398 fdisk/cfdisk.c:1453 +#: fdisk/cfdisk.c:1406 fdisk/cfdisk.c:1461 msgid "Don't create a partition" msgstr "No crear cap partició" -#: fdisk/cfdisk.c:1414 +#: fdisk/cfdisk.c:1422 msgid "!!! Internal error !!!" msgstr "!!! Error intern !!!" -#: fdisk/cfdisk.c:1417 +#: fdisk/cfdisk.c:1425 msgid "Size (in MB): " msgstr "Mida (en MB): " -#: fdisk/cfdisk.c:1451 +#: fdisk/cfdisk.c:1459 msgid "Beginning" msgstr "Principi" -#: fdisk/cfdisk.c:1451 +#: fdisk/cfdisk.c:1459 msgid "Add partition at beginning of free space" msgstr "Afegir partició al principi de l'espai lliure" -#: fdisk/cfdisk.c:1452 +#: fdisk/cfdisk.c:1460 msgid "End" msgstr "Final" -#: fdisk/cfdisk.c:1452 +#: fdisk/cfdisk.c:1460 msgid "Add partition at end of free space" msgstr "Afegir partició al final de l'espai lliure" -#: fdisk/cfdisk.c:1470 +#: fdisk/cfdisk.c:1478 msgid "No room to create the extended partition" msgstr "No hi ha espai per a crear la partició estesa" -#: fdisk/cfdisk.c:1514 +#: fdisk/cfdisk.c:1522 msgid "No partition table or unknown signature on partition table" msgstr "No hi ha taula de partició o aquesta té una firma desconeguda" -#: fdisk/cfdisk.c:1516 +#: fdisk/cfdisk.c:1524 msgid "Do you wish to start with a zero table [y/N] ?" msgstr "Desitgeu començar amb una taula buida [s/N]?" -#: fdisk/cfdisk.c:1568 +#: fdisk/cfdisk.c:1576 msgid "You specified more cylinders than fit on disk" msgstr "Heu especificat més cilindres dels que caben al disc" -#: fdisk/cfdisk.c:1598 +#: fdisk/cfdisk.c:1606 msgid "Cannot open disk drive" msgstr "No es pot obrir la unitat de disc" -#: fdisk/cfdisk.c:1600 fdisk/cfdisk.c:1779 +#: fdisk/cfdisk.c:1608 fdisk/cfdisk.c:1787 msgid "Opened disk read-only - you have no permission to write" msgstr "El disc obert és de sols lectura; no teniu permís per a escriure-hi" -#: fdisk/cfdisk.c:1621 +#: fdisk/cfdisk.c:1629 msgid "Cannot get disk size" msgstr "No es pot obtindre la mida del disc" -#: fdisk/cfdisk.c:1646 +#: fdisk/cfdisk.c:1654 msgid "Bad primary partition" msgstr "Partició primària incorrecta" -#: fdisk/cfdisk.c:1676 +#: fdisk/cfdisk.c:1684 msgid "Bad logical partition" msgstr "Partició lògica incorrecta" -#: fdisk/cfdisk.c:1791 +#: fdisk/cfdisk.c:1799 msgid "Warning!! This may destroy data on your disk!" msgstr "Atenció: Això pot destruir les dades del vostre disc!" -#: fdisk/cfdisk.c:1795 +#: fdisk/cfdisk.c:1803 msgid "Are you sure you want write the partition table to disk? (yes or no): " msgstr "" "Esteu segurs de que voleu escriure la taula de particions al disc? (si o " "no): " -#: fdisk/cfdisk.c:1801 +#: fdisk/cfdisk.c:1809 msgid "no" msgstr "no" -#: fdisk/cfdisk.c:1802 +#: fdisk/cfdisk.c:1810 msgid "Did not write partition table to disk" msgstr "No s'ha escrit la taula de particions al disc" -#: fdisk/cfdisk.c:1804 +#: fdisk/cfdisk.c:1812 msgid "yes" msgstr "si" -#: fdisk/cfdisk.c:1807 +#: fdisk/cfdisk.c:1815 msgid "Please enter `yes' or `no'" msgstr "Si us plau escriviu `si' o `no'" -#: fdisk/cfdisk.c:1811 +#: fdisk/cfdisk.c:1819 msgid "Writing partition table to disk..." msgstr "Escrivint la taula de particions al disc..." -#: fdisk/cfdisk.c:1836 fdisk/cfdisk.c:1840 +#: fdisk/cfdisk.c:1844 fdisk/cfdisk.c:1848 msgid "Wrote partition table to disk" msgstr "Taula de particions del disc, escrita" -#: fdisk/cfdisk.c:1838 +#: fdisk/cfdisk.c:1846 msgid "" "Wrote partition table, but re-read table failed. Reboot to update table." msgstr "" "S'ha escrit la taula de particions, però la nova lectura de la taula ha " "fallat. Reinicieu per a actualitzar-la." -#: fdisk/cfdisk.c:1848 +#: fdisk/cfdisk.c:1856 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this." msgstr "" "No hi han particions primàries marcades com a d'arrencada. Així la MBR del " "DOS no podrà arrencar." -#: fdisk/cfdisk.c:1850 +#: fdisk/cfdisk.c:1858 msgid "" "More than one primary partition is marked bootable. DOS MBR cannot boot this." msgstr "" "Hi ha més d'una partició primària marcada com d'arrencada. Així la MBR del " "DOS no podrà arrencar." -#: fdisk/cfdisk.c:1908 fdisk/cfdisk.c:2027 fdisk/cfdisk.c:2111 +#: fdisk/cfdisk.c:1916 fdisk/cfdisk.c:2035 fdisk/cfdisk.c:2119 msgid "Enter filename or press RETURN to display on screen: " msgstr "" "Escriviu el nom del fitxer o premeu Intro per a visualitzar-lo en pantalla: " -#: fdisk/cfdisk.c:1917 fdisk/cfdisk.c:2035 fdisk/cfdisk.c:2119 +#: fdisk/cfdisk.c:1925 fdisk/cfdisk.c:2043 fdisk/cfdisk.c:2127 #, c-format msgid "Cannot open file '%s'" msgstr "No es pot obrir el fitxer '%s'" -#: fdisk/cfdisk.c:1928 +#: fdisk/cfdisk.c:1936 #, c-format msgid "Disk Drive: %s\n" msgstr "Unitat de disc: %s\n" -#: fdisk/cfdisk.c:1930 +#: fdisk/cfdisk.c:1938 msgid "Sector 0:\n" msgstr "Sector 0:\n" -#: fdisk/cfdisk.c:1937 +#: fdisk/cfdisk.c:1945 #, c-format msgid "Sector %d:\n" msgstr "Sector %d:\n" -#: fdisk/cfdisk.c:1957 +#: fdisk/cfdisk.c:1965 msgid " None " msgstr " Cap " -#: fdisk/cfdisk.c:1959 +#: fdisk/cfdisk.c:1967 msgid " Pri/Log" msgstr " Pri/Lòg" -#: fdisk/cfdisk.c:1961 +#: fdisk/cfdisk.c:1969 msgid " Primary" msgstr " Primària" -#: fdisk/cfdisk.c:1963 +#: fdisk/cfdisk.c:1971 msgid " Logical" msgstr " Lògica" #. odd flag on end #. type id #. type name -#: fdisk/cfdisk.c:2001 fdisk/fdisk.c:1383 fdisk/fdisk.c:1688 +#: fdisk/cfdisk.c:2009 fdisk/fdisk.c:1392 fdisk/fdisk.c:1697 #: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:692 fdisk/sfdisk.c:581 msgid "Unknown" msgstr "Desconegut" -#: fdisk/cfdisk.c:2007 +#: fdisk/cfdisk.c:2015 #, c-format msgid "Boot (%02X)" msgstr "Arren.(%02X)" -#: fdisk/cfdisk.c:2009 fdisk/cfdisk.c:2505 +#: fdisk/cfdisk.c:2017 fdisk/cfdisk.c:2513 #, c-format msgid "Unknown (%02X)" msgstr "Desconegut (%02X)" -#: fdisk/cfdisk.c:2011 +#: fdisk/cfdisk.c:2019 #, c-format msgid "None (%02X)" msgstr "Cap (%02X)" -#: fdisk/cfdisk.c:2046 fdisk/cfdisk.c:2130 +#: fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2138 #, c-format msgid "Partition Table for %s\n" msgstr "Taula de particions per a %s\n" -#: fdisk/cfdisk.c:2048 +#: fdisk/cfdisk.c:2056 msgid " First Last\n" msgstr " Primer Últim\n" -#: fdisk/cfdisk.c:2049 +#: fdisk/cfdisk.c:2057 msgid "" " # Type Sector Sector Offset Length Filesystem Type (ID) Flags\n" msgstr "" " # Tipus Sector Sector Despl. Longitud (ID) Sistema Fitxers " "Etiqueta\n" -#: fdisk/cfdisk.c:2050 +#: fdisk/cfdisk.c:2058 msgid "" "-- ------- -------- --------- ------ --------- ---------------------- " "---------\n" @@ -1640,466 +1640,467 @@ msgstr "" "---------\n" #. Three-line heading. Read "Start Sector" etc vertically. -#: fdisk/cfdisk.c:2133 +#: fdisk/cfdisk.c:2141 msgid " ---Starting--- ----Ending---- Start Number of\n" msgstr " ----Inici---- -----Final---- Sector Número de\n" -#: fdisk/cfdisk.c:2134 +#: fdisk/cfdisk.c:2142 msgid " # Flags Head Sect Cyl ID Head Sect Cyl Sector Sectors\n" msgstr " # Indi. Cap. Sec. Cil. ID Capç.Sec. Cil. Sector Sectors\n" -#: fdisk/cfdisk.c:2135 +#: fdisk/cfdisk.c:2143 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n" msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n" -#: fdisk/cfdisk.c:2168 +#: fdisk/cfdisk.c:2176 msgid "Raw" msgstr "En cru" -#: fdisk/cfdisk.c:2168 +#: fdisk/cfdisk.c:2176 msgid "Print the table using raw data format" msgstr "Imprimir la taula utilitzant el format de dades en cru" -#: fdisk/cfdisk.c:2169 fdisk/cfdisk.c:2271 +#: fdisk/cfdisk.c:2177 fdisk/cfdisk.c:2279 msgid "Sectors" msgstr "Sectors" -#: fdisk/cfdisk.c:2169 +#: fdisk/cfdisk.c:2177 msgid "Print the table ordered by sectors" msgstr "Imprimir la taula ordenada per sectors" -#: fdisk/cfdisk.c:2170 +#: fdisk/cfdisk.c:2178 msgid "Table" msgstr "Taula" -#: fdisk/cfdisk.c:2170 +#: fdisk/cfdisk.c:2178 msgid "Just print the partition table" msgstr "Sols imprimir la taula de particions" -#: fdisk/cfdisk.c:2171 +#: fdisk/cfdisk.c:2179 msgid "Don't print the table" msgstr "No imprimir la taula" -#: fdisk/cfdisk.c:2199 +#: fdisk/cfdisk.c:2207 msgid "Help Screen for cfdisk" msgstr "Pantalla d'ajuda per a cfdisk" -#: fdisk/cfdisk.c:2201 +#: fdisk/cfdisk.c:2209 msgid "This is cfdisk, a curses based disk partitioning program, which" msgstr "" "Això és el cfdisk, un programa per al particionament del disc basat en " "curses," -#: fdisk/cfdisk.c:2202 +#: fdisk/cfdisk.c:2210 msgid "allows you to create, delete and modify partitions on your hard" msgstr "aquest us permetrà crear, suprimir i modificar particions en el vostre" -#: fdisk/cfdisk.c:2203 +#: fdisk/cfdisk.c:2211 msgid "disk drive." msgstr "disc dur." -#: fdisk/cfdisk.c:2205 +#: fdisk/cfdisk.c:2213 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb" msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb" -#: fdisk/cfdisk.c:2207 +#: fdisk/cfdisk.c:2215 msgid "Command Meaning" msgstr "Comandament Significat" -#: fdisk/cfdisk.c:2208 +#: fdisk/cfdisk.c:2216 msgid "------- -------" msgstr "------- -------" -#: fdisk/cfdisk.c:2209 +#: fdisk/cfdisk.c:2217 msgid " b Toggle bootable flag of the current partition" msgstr " b Fixa l'etiqueta d'arrencada en l'actual partició" -#: fdisk/cfdisk.c:2210 +#: fdisk/cfdisk.c:2218 msgid " d Delete the current partition" msgstr " d Suprimeix l'actual partició" -#: fdisk/cfdisk.c:2211 +#: fdisk/cfdisk.c:2219 msgid " g Change cylinders, heads, sectors-per-track parameters" msgstr "" " g Canvia paràmetres de cilindres, capçals i sectors per pista" -#: fdisk/cfdisk.c:2212 +#: fdisk/cfdisk.c:2220 msgid " WARNING: This option should only be used by people who" msgstr " ATENCIÓ: Aquesta opció sols hauria de ser usada per gent" -#: fdisk/cfdisk.c:2213 +#: fdisk/cfdisk.c:2221 msgid " know what they are doing." msgstr " que conegui el funcionament de la mateixa." -#: fdisk/cfdisk.c:2214 +#: fdisk/cfdisk.c:2222 msgid " h Print this screen" msgstr " h Imprimeix aquesta pantalla" -#: fdisk/cfdisk.c:2215 +#: fdisk/cfdisk.c:2223 msgid " m Maximize disk usage of the current partition" msgstr " m Maximitza l'utilització de disc de la partició actual" -#: fdisk/cfdisk.c:2216 +#: fdisk/cfdisk.c:2224 msgid " Note: This may make the partition incompatible with" msgstr " Nota: Aquesta opció pot fer la partició incompatible" -#: fdisk/cfdisk.c:2217 +#: fdisk/cfdisk.c:2225 msgid " DOS, OS/2, ..." msgstr " amb DOS, OS/2, ..." -#: fdisk/cfdisk.c:2218 +#: fdisk/cfdisk.c:2226 msgid " n Create new partition from free space" msgstr " n Crea una nova partició des de l'espai lliure" -#: fdisk/cfdisk.c:2219 +#: fdisk/cfdisk.c:2227 msgid " p Print partition table to the screen or to a file" msgstr "" " p Imprimeix la taula de particions en la pantalla o en un fitxer" -#: fdisk/cfdisk.c:2220 +#: fdisk/cfdisk.c:2228 msgid " There are several different formats for the partition" msgstr " Hi han diversos formats diferents per a la partició" -#: fdisk/cfdisk.c:2221 +#: fdisk/cfdisk.c:2229 msgid " that you can choose from:" msgstr " entre els que podeu escollir:" -#: fdisk/cfdisk.c:2222 +#: fdisk/cfdisk.c:2230 msgid " r - Raw data (exactly what would be written to disk)" msgstr "" " r - Dades en cru (exactament el que s'escriuria al disc)" -#: fdisk/cfdisk.c:2223 +#: fdisk/cfdisk.c:2231 msgid " s - Table ordered by sectors" msgstr " s - Taula ordenada per sectors" -#: fdisk/cfdisk.c:2224 +#: fdisk/cfdisk.c:2232 msgid " t - Table in raw format" msgstr " t - Taula en format en cru" -#: fdisk/cfdisk.c:2225 +#: fdisk/cfdisk.c:2233 msgid " q Quit program without writing partition table" msgstr " q Sortir del programa sense escriure la taula de particions" -#: fdisk/cfdisk.c:2226 +#: fdisk/cfdisk.c:2234 msgid " t Change the filesystem type" msgstr " t Canviar el tipus del sistema de fitxers" -#: fdisk/cfdisk.c:2227 +#: fdisk/cfdisk.c:2235 msgid " u Change units of the partition size display" msgstr " u Canviar les unitats de la mida visualitzava de la partició" -#: fdisk/cfdisk.c:2228 +#: fdisk/cfdisk.c:2236 msgid " Rotates through MB, sectors and cylinders" msgstr " Alterna entre MB, sectors i cilindres" -#: fdisk/cfdisk.c:2229 +#: fdisk/cfdisk.c:2237 msgid " W Write partition table to disk (must enter upper case W)" msgstr " W Escriu la taula de particions al disc (W en majúscula)" -#: fdisk/cfdisk.c:2230 +#: fdisk/cfdisk.c:2238 msgid " Since this might destroy data on the disk, you must" msgstr " Donat que això destruirà les dades del disc, haureu" -#: fdisk/cfdisk.c:2231 +#: fdisk/cfdisk.c:2239 msgid " either confirm or deny the write by entering `yes' or" msgstr " de confirmar o denegar escrivint `si' o" -#: fdisk/cfdisk.c:2232 +#: fdisk/cfdisk.c:2240 msgid " `no'" msgstr " `no'" -#: fdisk/cfdisk.c:2233 +#: fdisk/cfdisk.c:2241 msgid "Up Arrow Move cursor to the previous partition" msgstr "Cursor amunt Desplaçar el cursor a l'anterior partició" -#: fdisk/cfdisk.c:2234 +#: fdisk/cfdisk.c:2242 msgid "Down Arrow Move cursor to the next partition" msgstr "Cursor avall Desplaçar el cursor a la següent partició" -#: fdisk/cfdisk.c:2235 +#: fdisk/cfdisk.c:2243 msgid "CTRL-L Redraws the screen" msgstr "Ctrl-L Redibuixar la pantalla" -#: fdisk/cfdisk.c:2236 +#: fdisk/cfdisk.c:2244 msgid " ? Print this screen" msgstr " ? Imprimir aquesta pantalla" -#: fdisk/cfdisk.c:2238 +#: fdisk/cfdisk.c:2246 msgid "Note: All of the commands can be entered with either upper or lower" msgstr "Nota: Tots els comandaments es poden escriure en majúscules o" -#: fdisk/cfdisk.c:2239 +#: fdisk/cfdisk.c:2247 msgid "case letters (except for Writes)." msgstr "minúscules (excepte W per a escriure)." -#: fdisk/cfdisk.c:2269 fdisk/cfdisk.c:2599 fdisk/fdisksunlabel.c:322 +#: fdisk/cfdisk.c:2277 fdisk/cfdisk.c:2607 fdisk/fdisksunlabel.c:322 #: fdisk/fdisksunlabel.c:324 msgid "Cylinders" msgstr "Cilindres" -#: fdisk/cfdisk.c:2269 +#: fdisk/cfdisk.c:2277 msgid "Change cylinder geometry" msgstr "Canviar la geometria dels cilindres" -#: fdisk/cfdisk.c:2270 fdisk/fdisksunlabel.c:319 +#: fdisk/cfdisk.c:2278 fdisk/fdisksunlabel.c:319 msgid "Heads" msgstr "Capçals" -#: fdisk/cfdisk.c:2270 +#: fdisk/cfdisk.c:2278 msgid "Change head geometry" msgstr "Canviar la geometria dels capçals" -#: fdisk/cfdisk.c:2271 +#: fdisk/cfdisk.c:2279 msgid "Change sector geometry" msgstr "Canviar la geometria dels sectors" -#: fdisk/cfdisk.c:2272 +#: fdisk/cfdisk.c:2280 msgid "Done" msgstr "Fet" -#: fdisk/cfdisk.c:2272 +#: fdisk/cfdisk.c:2280 msgid "Done with changing geometry" msgstr "S'ha finalitzat el canvi de geometria" -#: fdisk/cfdisk.c:2285 +#: fdisk/cfdisk.c:2293 msgid "Enter the number of cylinders: " msgstr "Escriviu el número de cilindres: " -#: fdisk/cfdisk.c:2297 fdisk/cfdisk.c:2867 +#: fdisk/cfdisk.c:2305 fdisk/cfdisk.c:2875 msgid "Illegal cylinders value" msgstr "Valor dels cilindres no permes" -#: fdisk/cfdisk.c:2303 +#: fdisk/cfdisk.c:2311 msgid "Enter the number of heads: " msgstr "Escriviu el nombre de capçals: " -#: fdisk/cfdisk.c:2310 fdisk/cfdisk.c:2877 +#: fdisk/cfdisk.c:2318 fdisk/cfdisk.c:2885 msgid "Illegal heads value" msgstr "Valor dels capçals no permes" -#: fdisk/cfdisk.c:2316 +#: fdisk/cfdisk.c:2324 msgid "Enter the number of sectors per track: " msgstr "Escriviu el número de sectors per pista: " -#: fdisk/cfdisk.c:2323 fdisk/cfdisk.c:2884 +#: fdisk/cfdisk.c:2331 fdisk/cfdisk.c:2892 msgid "Illegal sectors value" msgstr "Valor dels sectors no permes" -#: fdisk/cfdisk.c:2426 +#: fdisk/cfdisk.c:2434 msgid "Enter filesystem type: " msgstr "Escriviu el tipus del sistema de fitxers: " -#: fdisk/cfdisk.c:2444 +#: fdisk/cfdisk.c:2452 msgid "Cannot change FS Type to empty" msgstr "No es pot canviar el tipus del sistema de fitxers a buit" -#: fdisk/cfdisk.c:2446 +#: fdisk/cfdisk.c:2454 msgid "Cannot change FS Type to extended" msgstr "No es pot canviar el tipus del sistema de fitxers a estes" -#: fdisk/cfdisk.c:2474 fdisk/fdisksunlabel.c:45 +#: fdisk/cfdisk.c:2482 fdisk/fdisksunlabel.c:45 msgid "Boot" msgstr "Arrencada" -#: fdisk/cfdisk.c:2476 +#: fdisk/cfdisk.c:2484 #, c-format msgid "Unk(%02X)" msgstr "Desc.(%02X)" -#: fdisk/cfdisk.c:2479 fdisk/cfdisk.c:2482 +#: fdisk/cfdisk.c:2487 fdisk/cfdisk.c:2490 msgid ", NC" msgstr ", NC" -#: fdisk/cfdisk.c:2487 fdisk/cfdisk.c:2490 +#: fdisk/cfdisk.c:2495 fdisk/cfdisk.c:2498 msgid "NC" msgstr "NC" -#: fdisk/cfdisk.c:2498 +#: fdisk/cfdisk.c:2506 msgid "Pri/Log" msgstr "Pri/Lòg" -#: fdisk/cfdisk.c:2574 +#: fdisk/cfdisk.c:2582 #, c-format msgid "Disk Drive: %s" msgstr "Unitat de disc: %s" -#: fdisk/cfdisk.c:2580 +#: fdisk/cfdisk.c:2588 #, c-format msgid "Size: %lld bytes, %ld MB" msgstr "Mida: %lld octets, %ld MB" -#: fdisk/cfdisk.c:2583 +#: fdisk/cfdisk.c:2591 #, c-format msgid "Size: %lld bytes, %ld.%ld GB" msgstr "Mida: %lld octets, %ld.%ld GB" -#: fdisk/cfdisk.c:2587 +#: fdisk/cfdisk.c:2595 #, c-format msgid "Heads: %d Sectors per Track: %d Cylinders: %d" msgstr "Capçals: %d Sectors per pista: %d Cilindres: %d" -#: fdisk/cfdisk.c:2591 +#: fdisk/cfdisk.c:2599 msgid "Name" msgstr "Nom" -#: fdisk/cfdisk.c:2592 +#: fdisk/cfdisk.c:2600 msgid "Flags" msgstr "Etiquetes" -#: fdisk/cfdisk.c:2593 +#: fdisk/cfdisk.c:2601 msgid "Part Type" msgstr "Tipus part." -#: fdisk/cfdisk.c:2594 +#: fdisk/cfdisk.c:2602 msgid "FS Type" msgstr "Tipus Sis.Fitx." -#: fdisk/cfdisk.c:2595 +#: fdisk/cfdisk.c:2603 msgid "[Label]" msgstr "[Etiqueta]" -#: fdisk/cfdisk.c:2597 +#: fdisk/cfdisk.c:2605 msgid " Sectors" msgstr " Sectors" -#: fdisk/cfdisk.c:2601 +#: fdisk/cfdisk.c:2609 msgid "Size (MB)" msgstr "Mida (MB)" -#: fdisk/cfdisk.c:2603 +#: fdisk/cfdisk.c:2611 msgid "Size (GB)" msgstr "Mida (GB)" -#: fdisk/cfdisk.c:2658 +#: fdisk/cfdisk.c:2666 msgid "Bootable" msgstr "Arrencada" -#: fdisk/cfdisk.c:2658 +#: fdisk/cfdisk.c:2666 msgid "Toggle bootable flag of the current partition" msgstr "Establir l'etiqueta de la partició actual com d'arrencada" -#: fdisk/cfdisk.c:2659 +#: fdisk/cfdisk.c:2667 msgid "Delete" msgstr "Suprimir" -#: fdisk/cfdisk.c:2659 +#: fdisk/cfdisk.c:2667 msgid "Delete the current partition" msgstr "Suprimir l'actual partició" -#: fdisk/cfdisk.c:2660 +#: fdisk/cfdisk.c:2668 msgid "Geometry" msgstr "Geometria" -#: fdisk/cfdisk.c:2660 +#: fdisk/cfdisk.c:2668 msgid "Change disk geometry (experts only)" msgstr "Canviar la geometria del disc (sols usuaris experts)" -#: fdisk/cfdisk.c:2661 +#: fdisk/cfdisk.c:2669 msgid "Help" msgstr "Ajuda" -#: fdisk/cfdisk.c:2661 +#: fdisk/cfdisk.c:2669 msgid "Print help screen" msgstr "Imprimir pantalla d'ajuda" -#: fdisk/cfdisk.c:2662 +#: fdisk/cfdisk.c:2670 msgid "Maximize" msgstr "Maximitza" -#: fdisk/cfdisk.c:2662 +#: fdisk/cfdisk.c:2670 msgid "Maximize disk usage of the current partition (experts only)" msgstr "" "Maximitzar la utilització del disc en la partició actual (sols usuaris " "experts)" -#: fdisk/cfdisk.c:2663 +#: fdisk/cfdisk.c:2671 msgid "New" msgstr "Nova" -#: fdisk/cfdisk.c:2663 +#: fdisk/cfdisk.c:2671 msgid "Create new partition from free space" msgstr "Crear una nova partició des de l'espai lliure" -#: fdisk/cfdisk.c:2664 +#: fdisk/cfdisk.c:2672 msgid "Print" msgstr "Imprimir" -#: fdisk/cfdisk.c:2664 +#: fdisk/cfdisk.c:2672 msgid "Print partition table to the screen or to a file" msgstr "Imprimir la taula de particions en la pantalla o en un fitxer" -#: fdisk/cfdisk.c:2665 +#: fdisk/cfdisk.c:2673 msgid "Quit" msgstr "Sortir" -#: fdisk/cfdisk.c:2665 +#: fdisk/cfdisk.c:2673 msgid "Quit program without writing partition table" msgstr "Sortir del programa sense escriure la taula de particions" -#: fdisk/cfdisk.c:2666 +#: fdisk/cfdisk.c:2674 msgid "Type" msgstr "Tipus" -#: fdisk/cfdisk.c:2666 +#: fdisk/cfdisk.c:2674 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)" msgstr "Canviar el tipus del sistema de fitxers (DOS, Linux, OS/2, etc.)" -#: fdisk/cfdisk.c:2667 +#: fdisk/cfdisk.c:2675 msgid "Units" msgstr "Unitats" -#: fdisk/cfdisk.c:2667 +#: fdisk/cfdisk.c:2675 msgid "Change units of the partition size display (MB, sect, cyl)" msgstr "Canviar les unitats de la mida de la partició (MB, sect., cil.)" -#: fdisk/cfdisk.c:2668 +#: fdisk/cfdisk.c:2676 msgid "Write" msgstr "Escriure" -#: fdisk/cfdisk.c:2668 +#: fdisk/cfdisk.c:2676 msgid "Write partition table to disk (this might destroy data)" msgstr "Escriure la taula de particions al disc (això pot destruir les dades)" -#: fdisk/cfdisk.c:2714 +#: fdisk/cfdisk.c:2722 msgid "Cannot make this partition bootable" msgstr "No es pot fer aquesta partició arrencable" -#: fdisk/cfdisk.c:2724 +#: fdisk/cfdisk.c:2732 msgid "Cannot delete an empty partition" msgstr "No es pot suprimir una partició buida" -#: fdisk/cfdisk.c:2744 fdisk/cfdisk.c:2746 +#: fdisk/cfdisk.c:2752 fdisk/cfdisk.c:2754 msgid "Cannot maximize this partition" msgstr "No es pot maximitzar aquesta partició" -#: fdisk/cfdisk.c:2754 +#: fdisk/cfdisk.c:2762 msgid "This partition is unusable" msgstr "Aquesta partició és inutilitzable" -#: fdisk/cfdisk.c:2756 +#: fdisk/cfdisk.c:2764 msgid "This partition is already in use" msgstr "Aquesta partició ja està en us" -#: fdisk/cfdisk.c:2773 +#: fdisk/cfdisk.c:2781 msgid "Cannot change the type of an empty partition" msgstr "No es pot canviar el tipus d'una partició buida" -#: fdisk/cfdisk.c:2800 fdisk/cfdisk.c:2806 +#: fdisk/cfdisk.c:2808 fdisk/cfdisk.c:2814 msgid "No more partitions" msgstr "No hi ha més particions" -#: fdisk/cfdisk.c:2813 +#: fdisk/cfdisk.c:2821 msgid "Illegal command" msgstr "Comandament no permès" -#: fdisk/cfdisk.c:2823 -msgid "Copyright (C) 1994-2000 Kevin E. Martin & aeb\n" +#: fdisk/cfdisk.c:2831 +#, fuzzy +msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n" msgstr "Copyright (C) 1994-2000 Kevin E. Martin & aeb\n" #. Unfortunately, xgettext does not handle multi-line strings #. so, let's use explicit \n's instead -#: fdisk/cfdisk.c:2830 +#: fdisk/cfdisk.c:2838 #, c-format msgid "" "\n" @@ -2378,11 +2379,11 @@ msgstr "Heu de definir els" msgid "heads" msgstr "capçals" -#: fdisk/fdisk.c:580 fdisk/fdisk.c:1213 fdisk/sfdisk.c:864 +#: fdisk/fdisk.c:580 fdisk/fdisk.c:1222 fdisk/sfdisk.c:864 msgid "sectors" msgstr "sectors" -#: fdisk/fdisk.c:582 fdisk/fdisk.c:1213 fdisk/fdiskbsdlabel.c:470 +#: fdisk/fdisk.c:582 fdisk/fdisk.c:1222 fdisk/fdiskbsdlabel.c:470 #: fdisk/sfdisk.c:864 msgid "cylinders" msgstr "cilindres" @@ -2512,70 +2513,70 @@ msgstr "Codi hex. (escriviu L per a veure la llista de codis): " msgid "%s (%d-%d, default %d): " msgstr "%s (%d-%d, valor per defecte %d): " -#: fdisk/fdisk.c:1125 +#: fdisk/fdisk.c:1134 #, c-format msgid "Using default value %d\n" msgstr "Usant el valor per defecte %d\n" -#: fdisk/fdisk.c:1129 +#: fdisk/fdisk.c:1138 msgid "Value out of range.\n" msgstr "El valor està fora del rang.\n" -#: fdisk/fdisk.c:1139 +#: fdisk/fdisk.c:1148 msgid "Partition number" msgstr "Número de partició" -#: fdisk/fdisk.c:1150 +#: fdisk/fdisk.c:1159 #, c-format msgid "Warning: partition %d has empty type\n" msgstr "Atenció: la partició %d és del tipus buit\n" -#: fdisk/fdisk.c:1172 fdisk/fdisk.c:1198 +#: fdisk/fdisk.c:1181 fdisk/fdisk.c:1207 #, fuzzy, c-format msgid "Selected partition %d\n" msgstr "S'ignorarà la partició estesa addicional %d\n" -#: fdisk/fdisk.c:1175 +#: fdisk/fdisk.c:1184 #, fuzzy msgid "No partition is defined yet!\n" msgstr "No hi han particions definides\n" -#: fdisk/fdisk.c:1201 +#: fdisk/fdisk.c:1210 msgid "All primary partitions have been defined already!\n" msgstr "" -#: fdisk/fdisk.c:1211 +#: fdisk/fdisk.c:1220 msgid "cylinder" msgstr "cilindre" -#: fdisk/fdisk.c:1211 +#: fdisk/fdisk.c:1220 msgid "sector" msgstr "sector" -#: fdisk/fdisk.c:1220 +#: fdisk/fdisk.c:1229 #, c-format msgid "Changing display/entry units to %s\n" msgstr "Canviant les unitats de visualització/entrada a %s\n" -#: fdisk/fdisk.c:1231 +#: fdisk/fdisk.c:1240 #, c-format msgid "WARNING: Partition %d is an extended partition\n" msgstr "ATENCIÓ: la partició %d és una partició estesa\n" -#: fdisk/fdisk.c:1242 +#: fdisk/fdisk.c:1251 msgid "DOS Compatibility flag is set\n" msgstr "L'etiqueta de compatibilitat amb DOS està establerta\n" -#: fdisk/fdisk.c:1246 +#: fdisk/fdisk.c:1255 msgid "DOS Compatibility flag is not set\n" msgstr "L'etiqueta de compatibilitat amb DOS no està establerta\n" -#: fdisk/fdisk.c:1338 +#: fdisk/fdisk.c:1347 #, c-format msgid "Partition %d does not exist yet!\n" msgstr "La partició %d encara no existeix!\n" -#: fdisk/fdisk.c:1343 +#: fdisk/fdisk.c:1352 msgid "" "Type 0 means free space to many systems\n" "(but not to Linux). Having partitions of\n" @@ -2587,7 +2588,7 @@ msgstr "" "tindre particions del tipus 0. Podeu suprimir-les\n" "amb el comandament `d'.\n" -#: fdisk/fdisk.c:1352 +#: fdisk/fdisk.c:1361 msgid "" "You cannot change a partition into an extended one or vice versa\n" "Delete it first.\n" @@ -2595,7 +2596,7 @@ msgstr "" "No podeu convertir una partició en estesa ni viceversa primer\n" "haureu d'esborrar-la.\n" -#: fdisk/fdisk.c:1361 +#: fdisk/fdisk.c:1370 msgid "" "Consider leaving partition 3 as Whole disk (5),\n" "as SunOS/Solaris expects it and even Linux likes it.\n" @@ -2606,7 +2607,7 @@ msgstr "" "Linux.\n" "\n" -#: fdisk/fdisk.c:1367 +#: fdisk/fdisk.c:1376 msgid "" "Consider leaving partition 9 as volume header (0),\n" "and partition 11 as entire volume (6)as IRIX expects it.\n" @@ -2617,59 +2618,59 @@ msgstr "" "espera.\n" "\n" -#: fdisk/fdisk.c:1380 +#: fdisk/fdisk.c:1389 #, c-format msgid "Changed system type of partition %d to %x (%s)\n" msgstr "S'ha canviat el tipus del sistema de la partició %d per %x (%s)\n" -#: fdisk/fdisk.c:1434 +#: fdisk/fdisk.c:1443 #, c-format msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n" msgstr "La partició %d té diferents començaments físics/lògics (no Linux?):\n" -#: fdisk/fdisk.c:1436 fdisk/fdisk.c:1444 fdisk/fdisk.c:1453 fdisk/fdisk.c:1463 +#: fdisk/fdisk.c:1445 fdisk/fdisk.c:1453 fdisk/fdisk.c:1462 fdisk/fdisk.c:1472 #, c-format msgid " phys=(%d, %d, %d) " msgstr " físic=(%d, %d, %d) " -#: fdisk/fdisk.c:1437 fdisk/fdisk.c:1445 +#: fdisk/fdisk.c:1446 fdisk/fdisk.c:1454 #, c-format msgid "logical=(%d, %d, %d)\n" msgstr "lògic=(%d, %d, %d)\n" -#: fdisk/fdisk.c:1442 +#: fdisk/fdisk.c:1451 #, c-format msgid "Partition %d has different physical/logical endings:\n" msgstr "La partició %d té diferents finals físics/lògics:\n" -#: fdisk/fdisk.c:1451 +#: fdisk/fdisk.c:1460 #, c-format msgid "Partition %i does not start on cylinder boundary:\n" msgstr "La partició %i no comença en el límit del cilindre:\n" -#: fdisk/fdisk.c:1454 +#: fdisk/fdisk.c:1463 #, c-format msgid "should be (%d, %d, 1)\n" msgstr "ha de ser (%d, %d, 1)\n" -#: fdisk/fdisk.c:1460 -#, c-format -msgid "Partition %i does not end on cylinder boundary:\n" -msgstr "La partició %i no acaba en el límit del cilindre:\n" +#: fdisk/fdisk.c:1469 +#, fuzzy, c-format +msgid "Partition %i does not end on cylinder boundary.\n" +msgstr "La partició %d no acaba en un límit de cilindre.\n" -#: fdisk/fdisk.c:1464 +#: fdisk/fdisk.c:1473 #, c-format msgid "should be (%d, %d, %d)\n" msgstr "ha de ser (%d, %d, %d)\n" -#: fdisk/fdisk.c:1476 +#: fdisk/fdisk.c:1485 #, fuzzy, c-format msgid "" "\n" "Disk %s: %ld MB, %lld bytes\n" msgstr "%s: No mida (%ld vs %ld) octets\n" -#: fdisk/fdisk.c:1479 +#: fdisk/fdisk.c:1488 #, fuzzy, c-format msgid "" "\n" @@ -2679,7 +2680,7 @@ msgstr "" "Disc %s: %d capçals, %d sectors, %d cilindres\n" "\n" -#: fdisk/fdisk.c:1481 +#: fdisk/fdisk.c:1490 #, fuzzy, c-format msgid "%d heads, %d sectors/track, %d cylinders" msgstr "" @@ -2687,19 +2688,19 @@ msgstr "" "Disc %s: %d capçals, %d sectors, %d cilindres\n" "\n" -#: fdisk/fdisk.c:1484 +#: fdisk/fdisk.c:1493 #, c-format msgid ", total %lu sectors" msgstr "" -#: fdisk/fdisk.c:1487 +#: fdisk/fdisk.c:1496 #, c-format msgid "" "Units = %s of %d * %d = %d bytes\n" "\n" msgstr "" -#: fdisk/fdisk.c:1595 +#: fdisk/fdisk.c:1604 msgid "" "Nothing to do. Ordering is correct already.\n" "\n" @@ -2707,16 +2708,16 @@ msgstr "" "Res a fer. L'ordre és correcta.\n" "\n" -#: fdisk/fdisk.c:1659 +#: fdisk/fdisk.c:1668 #, c-format msgid "%*s Boot Start End Blocks Id System\n" msgstr "%*s Arrenc. Comença Acaba Blocs Id. Sistema\n" -#: fdisk/fdisk.c:1660 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:677 +#: fdisk/fdisk.c:1669 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:677 msgid "Device" msgstr "Dispositiu" -#: fdisk/fdisk.c:1697 +#: fdisk/fdisk.c:1706 msgid "" "\n" "Partition table entries are not in disk order\n" @@ -2724,7 +2725,7 @@ msgstr "" "\n" "Les entrades en la taula de particions no estan en ordre al disc\n" -#: fdisk/fdisk.c:1707 +#: fdisk/fdisk.c:1716 #, c-format msgid "" "\n" @@ -2735,92 +2736,92 @@ msgstr "" "Disc %s: %d capçals, %d sectors, %d cilindres\n" "\n" -#: fdisk/fdisk.c:1709 +#: fdisk/fdisk.c:1718 msgid "Nr AF Hd Sec Cyl Hd Sec Cyl Start Size ID\n" msgstr "Núm IA Cab Sect Cil Cap Sect Cil Comença Mida ID\n" -#: fdisk/fdisk.c:1753 +#: fdisk/fdisk.c:1762 #, c-format msgid "Warning: partition %d contains sector 0\n" msgstr "Atenció: la partició %d conté el sector 0\n" -#: fdisk/fdisk.c:1756 +#: fdisk/fdisk.c:1765 #, c-format msgid "Partition %d: head %d greater than maximum %d\n" msgstr "Partició %d: el capçal %d supera el màxim %d\n" -#: fdisk/fdisk.c:1759 +#: fdisk/fdisk.c:1768 #, c-format msgid "Partition %d: sector %d greater than maximum %d\n" msgstr "Partició %d: el sector %d supera el màxim %d\n" -#: fdisk/fdisk.c:1762 +#: fdisk/fdisk.c:1771 #, c-format msgid "Partitions %d: cylinder %d greater than maximum %d\n" msgstr "Partició %d: el cilindre %d supera el màxim %d\n" -#: fdisk/fdisk.c:1766 +#: fdisk/fdisk.c:1775 #, c-format msgid "Partition %d: previous sectors %d disagrees with total %d\n" msgstr "Partició %d: sectors anteriors %d difereixen del total %d\n" -#: fdisk/fdisk.c:1798 +#: fdisk/fdisk.c:1807 #, c-format msgid "Warning: bad start-of-data in partition %d\n" msgstr "Atenció: inici de dades incorrecte en la partició %d\n" -#: fdisk/fdisk.c:1806 +#: fdisk/fdisk.c:1815 #, c-format msgid "Warning: partition %d overlaps partition %d.\n" msgstr "Atenció: la partició %d es solapa amb la partició %d.\n" -#: fdisk/fdisk.c:1826 +#: fdisk/fdisk.c:1835 #, c-format msgid "Warning: partition %d is empty\n" msgstr "Atenció: la partició %d està buida\n" -#: fdisk/fdisk.c:1831 +#: fdisk/fdisk.c:1840 #, c-format msgid "Logical partition %d not entirely in partition %d\n" msgstr "La partició lògica %d no està integrada en la partició %d\n" -#: fdisk/fdisk.c:1837 +#: fdisk/fdisk.c:1846 #, c-format msgid "Total allocated sectors %d greater than the maximum %d\n" msgstr "El total de sectors assignats %d supera el màxim de %d\n" -#: fdisk/fdisk.c:1840 +#: fdisk/fdisk.c:1849 #, c-format msgid "%d unallocated sectors\n" msgstr "%d sectors no assignats\n" -#: fdisk/fdisk.c:1853 fdisk/fdisksgilabel.c:661 fdisk/fdisksunlabel.c:507 +#: fdisk/fdisk.c:1862 fdisk/fdisksgilabel.c:661 fdisk/fdisksunlabel.c:507 #, c-format msgid "Partition %d is already defined. Delete it before re-adding it.\n" msgstr "" "La partició %d ja està definida. Esborreu-la abans de tornar-la a afegir.\n" -#: fdisk/fdisk.c:1877 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:683 +#: fdisk/fdisk.c:1886 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:683 #: fdisk/fdisksunlabel.c:522 #, c-format msgid "First %s" msgstr "Primer %s" -#: fdisk/fdisk.c:1892 fdisk/fdisksunlabel.c:563 +#: fdisk/fdisk.c:1901 fdisk/fdisksunlabel.c:563 #, c-format msgid "Sector %d is already allocated\n" msgstr "El sector %d ja està assignat\n" -#: fdisk/fdisk.c:1928 +#: fdisk/fdisk.c:1937 msgid "No free sectors available\n" msgstr "No hi ha cap sector lliure disponible\n" -#: fdisk/fdisk.c:1937 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:574 +#: fdisk/fdisk.c:1946 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:574 #, c-format msgid "Last %s or +size or +sizeM or +sizeK" msgstr "Últim %s o +mida o +midaM o +midaK" -#: fdisk/fdisk.c:2002 +#: fdisk/fdisk.c:2011 msgid "" "\tSorry - this fdisk cannot handle AIX disk labels.\n" "\tIf you want to add DOS-type partitions, create\n" @@ -2832,15 +2833,15 @@ msgstr "" "\t particions DOS (Useu o).\n" "\tATENCIÓ: Això destruirà l'actual contingut del disc.\n" -#: fdisk/fdisk.c:2014 fdisk/fdiskbsdlabel.c:618 +#: fdisk/fdisk.c:2023 fdisk/fdiskbsdlabel.c:618 msgid "The maximum number of partitions has been created\n" msgstr "S'ha creat el màxim número de particions\n" -#: fdisk/fdisk.c:2022 +#: fdisk/fdisk.c:2031 msgid "You must delete some partition and add an extended partition first\n" msgstr "Primer heu de suprimir alguna partició i afegir-ne una d'estesa\n" -#: fdisk/fdisk.c:2027 +#: fdisk/fdisk.c:2036 #, c-format msgid "" "Command action\n" @@ -2851,20 +2852,20 @@ msgstr "" "%s\n" " p Partició primària (1-4)\n" -#: fdisk/fdisk.c:2029 +#: fdisk/fdisk.c:2038 msgid "l logical (5 or over)" msgstr "l lògica (5 o superior)" -#: fdisk/fdisk.c:2029 +#: fdisk/fdisk.c:2038 msgid "e extended" msgstr "e estesa" -#: fdisk/fdisk.c:2048 +#: fdisk/fdisk.c:2057 #, c-format msgid "Invalid partition number for type `%c'\n" msgstr "Número de partició invàlida pel tipus `%c'\n" -#: fdisk/fdisk.c:2084 +#: fdisk/fdisk.c:2093 msgid "" "The partition table has been altered!\n" "\n" @@ -2872,11 +2873,11 @@ msgstr "" "Ja s'ha modificat la taula de particions!\n" "\n" -#: fdisk/fdisk.c:2093 +#: fdisk/fdisk.c:2102 msgid "Calling ioctl() to re-read partition table.\n" msgstr "Cridant a ioctl() per a rellegir la taula de particions.\n" -#: fdisk/fdisk.c:2109 +#: fdisk/fdisk.c:2118 #, c-format msgid "" "\n" @@ -2889,7 +2890,7 @@ msgstr "" "El nucli encara usa l'antiga taula.\n" "La taula nova s'usarà després de reiniciar.\n" -#: fdisk/fdisk.c:2119 +#: fdisk/fdisk.c:2128 msgid "" "\n" "WARNING: If you have created or modified any DOS 6.x\n" @@ -2901,67 +2902,67 @@ msgstr "" "particions DOS 6.x, mireu la pàgina del manual del fdisk\n" "per a informació addicional.\n" -#: fdisk/fdisk.c:2126 +#: fdisk/fdisk.c:2135 msgid "Syncing disks.\n" msgstr "Sincronitzant els discs.\n" -#: fdisk/fdisk.c:2173 +#: fdisk/fdisk.c:2182 #, c-format msgid "Partition %d has no data area\n" msgstr "La partició %d no té cap àrea amb dades\n" -#: fdisk/fdisk.c:2178 +#: fdisk/fdisk.c:2187 msgid "New beginning of data" msgstr "Nou començament de dades" -#: fdisk/fdisk.c:2194 +#: fdisk/fdisk.c:2203 msgid "Expert command (m for help): " msgstr "Comandament expert (m per a l'ajuda): " -#: fdisk/fdisk.c:2207 +#: fdisk/fdisk.c:2216 msgid "Number of cylinders" msgstr "Número de cilindres" -#: fdisk/fdisk.c:2234 +#: fdisk/fdisk.c:2243 msgid "Number of heads" msgstr "Número de capçals" -#: fdisk/fdisk.c:2259 +#: fdisk/fdisk.c:2268 msgid "Number of sectors" msgstr "Número de sectors" -#: fdisk/fdisk.c:2262 +#: fdisk/fdisk.c:2271 msgid "Warning: setting sector offset for DOS compatiblity\n" msgstr "" "Atenció: establint desplaçament del sector per a la compatibilitat amb DOS\n" -#: fdisk/fdisk.c:2337 +#: fdisk/fdisk.c:2346 #, c-format msgid "Disk %s doesn't contain a valid partition table\n" msgstr "El disc %s no conté una taula de particions vàlida\n" -#: fdisk/fdisk.c:2351 +#: fdisk/fdisk.c:2360 #, c-format msgid "Cannot open %s\n" msgstr "No es pot obrir %s\n" -#: fdisk/fdisk.c:2367 fdisk/sfdisk.c:2363 +#: fdisk/fdisk.c:2376 fdisk/sfdisk.c:2363 #, c-format msgid "cannot open %s\n" msgstr "no es pot obrir %s\n" -#: fdisk/fdisk.c:2389 +#: fdisk/fdisk.c:2398 #, c-format msgid "%c: unknown command\n" msgstr "%c: comandament desconegut\n" -#: fdisk/fdisk.c:2457 +#: fdisk/fdisk.c:2466 msgid "This kernel finds the sector size itself - -b option ignored\n" msgstr "" "Aquest nucli cerca la mida del sector por si mateix; l'opció -b serà " "ignorada\n" -#: fdisk/fdisk.c:2461 +#: fdisk/fdisk.c:2470 msgid "" "Warning: the -b (set sector size) option should be used with one specified " "device\n" @@ -2970,18 +2971,18 @@ msgstr "" "dispositiu específic\n" #. OSF label, and no DOS label -#: fdisk/fdisk.c:2520 +#: fdisk/fdisk.c:2529 #, c-format msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n" msgstr "" "A l'entrar el mode d'etiqueta, s'ha detectat una etiqueta de disc OSF/1 en %" "s.\n" -#: fdisk/fdisk.c:2530 +#: fdisk/fdisk.c:2539 msgid "Command (m for help): " msgstr "Comandament (m per a l'ajuda): " -#: fdisk/fdisk.c:2546 +#: fdisk/fdisk.c:2555 #, c-format msgid "" "\n" @@ -2990,15 +2991,15 @@ msgstr "" "\n" "L'actual fitxer d'arrencada és: %s\n" -#: fdisk/fdisk.c:2548 +#: fdisk/fdisk.c:2557 msgid "Please enter the name of the new boot file: " msgstr "Si us plau entreu el nom del nou fitxer d'arrencada: " -#: fdisk/fdisk.c:2550 +#: fdisk/fdisk.c:2559 msgid "Boot file unchanged\n" msgstr "No s'ha modificat el fitxer d'arrencada\n" -#: fdisk/fdisk.c:2615 +#: fdisk/fdisk.c:2624 msgid "" "\n" "\tSorry, no experts menu for SGI partition tables available.\n" @@ -6125,7 +6126,7 @@ msgid "Password error." msgstr "Error de contrasenya." #: login-utils/chfn.c:176 login-utils/chsh.c:167 login-utils/login.c:780 -#: login-utils/newgrp.c:48 login-utils/simpleinit.c:323 mount/lomount.c:249 +#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:249 #: mount/lomount.c:254 msgid "Password: " msgstr "Contrasenya: " @@ -6918,33 +6919,37 @@ msgstr "Desmuntant els sistemes de fitxers restants..." msgid "shutdown: Couldn't umount %s: %s\n" msgstr "shutdown: No es pot desmuntar %s: %s\n" -#: login-utils/simpleinit.c:128 +#: login-utils/simpleinit.c:130 msgid "Booting to single user mode.\n" msgstr "Arrencant en mode d'un sol usuari.\n" -#: login-utils/simpleinit.c:132 +#: login-utils/simpleinit.c:134 msgid "exec of single user shell failed\n" msgstr "l'execució de l'intèrpret d'ordres en mode d'usuari únic ha fallat\n" -#: login-utils/simpleinit.c:136 +#: login-utils/simpleinit.c:138 msgid "fork of single user shell failed\n" msgstr "" "l'establiment del canvi a un sol usuari a l'intèrpret d'ordres ha fallat\n" -#: login-utils/simpleinit.c:204 +#: login-utils/simpleinit.c:206 msgid "error opening fifo\n" msgstr "error obrint fifo\n" -#: login-utils/simpleinit.c:242 +#: login-utils/simpleinit.c:210 +msgid "error setting close-on-exec on /dev/initctl" +msgstr "" + +#: login-utils/simpleinit.c:257 msgid "error running finalprog\n" msgstr "error executant finalprog\n" #. Error -#: login-utils/simpleinit.c:246 +#: login-utils/simpleinit.c:261 msgid "error forking finalprog\n" msgstr "error establint un canvi per a finalprog\n" -#: login-utils/simpleinit.c:328 +#: login-utils/simpleinit.c:343 msgid "" "\n" "Wrong password.\n" @@ -6952,35 +6957,35 @@ msgstr "" "\n" "Contrasenya incorrecta.\n" -#: login-utils/simpleinit.c:401 +#: login-utils/simpleinit.c:416 msgid "lstat of path failed\n" msgstr "El `lstat' de la ruta ha fallat\n" -#: login-utils/simpleinit.c:409 +#: login-utils/simpleinit.c:424 msgid "stat of path failed\n" msgstr "el 'stat' de la ruta ha fallat\n" -#: login-utils/simpleinit.c:417 +#: login-utils/simpleinit.c:432 msgid "open of directory failed\n" msgstr "l'obertura del directori ha fallat.\n" -#: login-utils/simpleinit.c:491 +#: login-utils/simpleinit.c:506 msgid "fork failed\n" msgstr "l'establiment del canvi ha fallat\n" -#: login-utils/simpleinit.c:522 text-utils/more.c:1705 +#: login-utils/simpleinit.c:537 text-utils/more.c:1709 msgid "exec failed\n" msgstr "l'execució (exec) ha fallat\n" -#: login-utils/simpleinit.c:546 +#: login-utils/simpleinit.c:561 msgid "cannot open inittab\n" msgstr "no es pot obrir inittab\n" -#: login-utils/simpleinit.c:613 +#: login-utils/simpleinit.c:628 msgid "no TERM or cannot stat tty\n" msgstr "sense TERM o no es pot fer stat a la tty\n" -#: login-utils/simpleinit.c:919 +#: login-utils/simpleinit.c:934 #, c-format msgid "error stopping service: \"%s\"" msgstr "error aturant el servei: \"%s\"" @@ -7269,12 +7274,12 @@ msgstr "useu: script [-a] [-f] [-q] [-t] [fitxer]\n" msgid "Script started, file is %s\n" msgstr "Script executat, el fitxer és %s\n" -#: misc-utils/script.c:254 +#: misc-utils/script.c:255 #, c-format msgid "Script started on %s" msgstr "Script executat sobre (%s)" -#: misc-utils/script.c:325 +#: misc-utils/script.c:327 #, c-format msgid "" "\n" @@ -7283,16 +7288,16 @@ msgstr "" "\n" "Script finalitzat (%s)" -#: misc-utils/script.c:333 +#: misc-utils/script.c:335 #, c-format msgid "Script done, file is %s\n" msgstr "Script finalitzat, el fitxer és %s\n" -#: misc-utils/script.c:344 +#: misc-utils/script.c:346 msgid "openpty failed\n" msgstr "openpty ha fallat\n" -#: misc-utils/script.c:378 +#: misc-utils/script.c:380 msgid "Out of pty's\n" msgstr "No queden pty\n" @@ -7561,42 +7566,42 @@ msgstr "mount: no es pot obrir %s - en el seu lloc s'usarà %s\n" #. and we cannot create it. Read-only filesystem? #. Too many files open in the system? #. Filesystem full? -#: mount/fstab.c:374 +#: mount/fstab.c:387 #, c-format msgid "can't create lock file %s: %s (use -n flag to override)" msgstr "" "no es pot crear el fitxer de blocat %s: %s (useu l'etiqueta -n per a " "modificar aquest valor)" -#: mount/fstab.c:386 +#: mount/fstab.c:399 #, c-format msgid "can't link lock file %s: %s (use -n flag to override)" msgstr "" "no es pot enllaçar el fitxer de blocat %s: %s (useu l'etiqueta -n per a " "modificar aquest valor)" -#: mount/fstab.c:398 +#: mount/fstab.c:411 #, c-format msgid "can't open lock file %s: %s (use -n flag to override)" msgstr "" "no es pot obrir el fitxer de blocat %s: %s (useu l'etiqueta -n per a " "modificar aquest valor)" -#: mount/fstab.c:413 +#: mount/fstab.c:426 #, c-format msgid "Can't lock lock file %s: %s\n" msgstr "No es pot blocar al fitxer de blocat %s: %s\n" -#: mount/fstab.c:426 +#: mount/fstab.c:439 #, c-format msgid "can't lock lock file %s: %s" msgstr "no es pot blocar al fitxer de blocat %s: %s" -#: mount/fstab.c:428 +#: mount/fstab.c:441 msgid "timed out" msgstr "temps d'espera excedit" -#: mount/fstab.c:435 +#: mount/fstab.c:448 #, c-format msgid "" "Cannot create link %s\n" @@ -7605,22 +7610,22 @@ msgstr "" "No es pot crear l'enllaç %s\n" "Potser hi hagi un fitxer de blocat obsolet?\n" -#: mount/fstab.c:484 mount/fstab.c:520 +#: mount/fstab.c:497 mount/fstab.c:533 #, c-format msgid "cannot open %s (%s) - mtab not updated" msgstr "no es pot obrir %s (%s) - mtab no actualitzat" -#: mount/fstab.c:528 +#: mount/fstab.c:541 #, c-format msgid "error writing %s: %s" msgstr "error escrivint %s: %s" -#: mount/fstab.c:536 +#: mount/fstab.c:549 #, c-format msgid "error changing mode of %s: %s\n" msgstr "error al canviar el mode de %s: %s\n" -#: mount/fstab.c:554 +#: mount/fstab.c:567 #, c-format msgid "can't rename %s to %s: %s\n" msgstr "no es pot reanomenar %s per %s: %s\n" @@ -8840,34 +8845,34 @@ msgstr "Rendiment de l'intercanvi: %ld intents\t %ld encerts\n" msgid "------ Shared Memory Segment Creators/Owners --------\n" msgstr "----- Creadors/Propietaris dels segments memòria compartida -------\n" -#: sys-utils/ipcs.c:300 sys-utils/ipcs.c:417 sys-utils/ipcs.c:516 +#: sys-utils/ipcs.c:300 sys-utils/ipcs.c:420 sys-utils/ipcs.c:519 #, c-format msgid "%-10s %-10s %-10s %-10s %-10s %-10s\n" msgstr "%-10s %-10s %-10s %-10s %-10s %-10s\n" #: sys-utils/ipcs.c:301 sys-utils/ipcs.c:307 sys-utils/ipcs.c:314 -#: sys-utils/ipcs.c:320 sys-utils/ipcs.c:424 +#: sys-utils/ipcs.c:320 sys-utils/ipcs.c:427 msgid "shmid" msgstr "shmid" -#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:320 sys-utils/ipcs.c:418 -#: sys-utils/ipcs.c:433 sys-utils/ipcs.c:517 sys-utils/ipcs.c:535 +#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:320 sys-utils/ipcs.c:421 +#: sys-utils/ipcs.c:436 sys-utils/ipcs.c:520 sys-utils/ipcs.c:538 msgid "perms" msgstr "perms" -#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:517 +#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:421 sys-utils/ipcs.c:520 msgid "cuid" msgstr "cuid" -#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:517 +#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:421 sys-utils/ipcs.c:520 msgid "cgid" msgstr "cgid" -#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:517 +#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:421 sys-utils/ipcs.c:520 msgid "uid" msgstr "uid" -#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:517 +#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:520 msgid "gid" msgstr "gid" @@ -8881,8 +8886,8 @@ msgid "%-10s %-10s %-20s %-20s %-20s\n" msgstr "%-10s %-10s %-20s %-20s %-20s\n" #: sys-utils/ipcs.c:307 sys-utils/ipcs.c:314 sys-utils/ipcs.c:320 -#: sys-utils/ipcs.c:424 sys-utils/ipcs.c:433 sys-utils/ipcs.c:523 -#: sys-utils/ipcs.c:529 sys-utils/ipcs.c:535 +#: sys-utils/ipcs.c:427 sys-utils/ipcs.c:436 sys-utils/ipcs.c:526 +#: sys-utils/ipcs.c:532 sys-utils/ipcs.c:538 msgid "owner" msgstr "propietari" @@ -8902,7 +8907,7 @@ msgstr "modificat" msgid "------ Shared Memory Creator/Last-op --------\n" msgstr "-- Creador/últim operador memòria compartida --\n" -#: sys-utils/ipcs.c:313 sys-utils/ipcs.c:528 +#: sys-utils/ipcs.c:313 sys-utils/ipcs.c:531 #, c-format msgid "%-10s %-10s %-10s %-10s\n" msgstr "%-10s %-10s %-10s %-10s\n" @@ -8924,7 +8929,7 @@ msgstr "---- Segments de memòria compartida ----\n" msgid "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n" msgstr "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n" -#: sys-utils/ipcs.c:320 sys-utils/ipcs.c:433 sys-utils/ipcs.c:535 +#: sys-utils/ipcs.c:320 sys-utils/ipcs.c:436 sys-utils/ipcs.c:538 msgid "key" msgstr "clau" @@ -8941,208 +8946,208 @@ msgid "status" msgstr "estat" #: 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 +#: sys-utils/ipcs.c:458 sys-utils/ipcs.c:460 sys-utils/ipcs.c:559 +#: sys-utils/ipcs.c:561 sys-utils/ipcs.c:563 sys-utils/ipcs.c:616 +#: sys-utils/ipcs.c:618 sys-utils/ipcs.c:647 sys-utils/ipcs.c:649 +#: sys-utils/ipcs.c:651 sys-utils/ipcs.c:675 msgid "Not set" msgstr "No establert" -#: sys-utils/ipcs.c:371 +#: sys-utils/ipcs.c:374 msgid "dest" msgstr "dest" -#: sys-utils/ipcs.c:372 +#: sys-utils/ipcs.c:375 msgid "locked" msgstr "blocat" -#: sys-utils/ipcs.c:392 +#: sys-utils/ipcs.c:395 msgid "kernel not configured for semaphores\n" msgstr "nucli no configurat per als semàfors\n" -#: sys-utils/ipcs.c:398 +#: sys-utils/ipcs.c:401 msgid "------ Semaphore Limits --------\n" msgstr "-------- Límits semàfor --------\n" -#: sys-utils/ipcs.c:402 +#: sys-utils/ipcs.c:405 #, c-format msgid "max number of arrays = %d\n" msgstr "màxim nombre de matrius = %d\n" -#: sys-utils/ipcs.c:403 +#: sys-utils/ipcs.c:406 #, c-format msgid "max semaphores per array = %d\n" msgstr "màx. semàfors per matriu = %d\n" -#: sys-utils/ipcs.c:404 +#: sys-utils/ipcs.c:407 #, c-format msgid "max semaphores system wide = %d\n" msgstr "màx. semàfors al sistema = %d\n" -#: sys-utils/ipcs.c:405 +#: sys-utils/ipcs.c:408 #, c-format msgid "max ops per semop call = %d\n" msgstr "màx. oper. per crida semop = %d\n" -#: sys-utils/ipcs.c:406 +#: sys-utils/ipcs.c:409 #, c-format msgid "semaphore max value = %d\n" msgstr "valor màxim del semàfor = %d\n" -#: sys-utils/ipcs.c:410 +#: sys-utils/ipcs.c:413 msgid "------ Semaphore Status --------\n" msgstr "------ Estat del semàfor ------\n" -#: sys-utils/ipcs.c:411 +#: sys-utils/ipcs.c:414 #, c-format msgid "used arrays = %d\n" msgstr "matrius usades = %d\n" -#: sys-utils/ipcs.c:412 +#: sys-utils/ipcs.c:415 #, c-format msgid "allocated semaphores = %d\n" msgstr "semàfors assignats = %d\n" -#: sys-utils/ipcs.c:416 +#: sys-utils/ipcs.c:419 msgid "------ Semaphore Arrays Creators/Owners --------\n" msgstr "----- Creadors/propietaris matrius semàfor -----\n" -#: sys-utils/ipcs.c:418 sys-utils/ipcs.c:433 +#: sys-utils/ipcs.c:421 sys-utils/ipcs.c:436 msgid "semid" msgstr "semid" -#: sys-utils/ipcs.c:422 +#: sys-utils/ipcs.c:425 msgid "------ Shared Memory Operation/Change Times --------\n" msgstr "-- Temps operació/modificació memòria compartida --\n" -#: sys-utils/ipcs.c:423 +#: sys-utils/ipcs.c:426 #, c-format msgid "%-8s %-10s %-26.24s %-26.24s\n" msgstr "%-8s %-10s %-26.24s %-26.24s\n" -#: sys-utils/ipcs.c:424 +#: sys-utils/ipcs.c:427 msgid "last-op" msgstr "última operació" -#: sys-utils/ipcs.c:424 +#: sys-utils/ipcs.c:427 msgid "last-changed" msgstr "última modificació" -#: sys-utils/ipcs.c:431 +#: sys-utils/ipcs.c:434 msgid "------ Semaphore Arrays --------\n" msgstr "------ Matrius del semàfor ------\n" -#: sys-utils/ipcs.c:432 sys-utils/ipcs.c:675 +#: sys-utils/ipcs.c:435 sys-utils/ipcs.c:678 #, c-format msgid "%-10s %-10s %-10s %-10s %-10s\n" msgstr "%-10s %-10s %-10s %-10s %-10s\n" -#: sys-utils/ipcs.c:434 +#: sys-utils/ipcs.c:437 msgid "nsems" msgstr "nsems" -#: sys-utils/ipcs.c:493 +#: sys-utils/ipcs.c:496 msgid "kernel not configured for message queues\n" msgstr "el nucli no està configurat per a cues de missatges\n" -#: sys-utils/ipcs.c:501 +#: sys-utils/ipcs.c:504 msgid "------ Messages: Limits --------\n" msgstr "------ Missatges: límits -------\n" -#: sys-utils/ipcs.c:502 +#: sys-utils/ipcs.c:505 #, c-format msgid "max queues system wide = %d\n" msgstr "nombre màx. de cues al sistema = %d\n" -#: sys-utils/ipcs.c:503 +#: sys-utils/ipcs.c:506 #, c-format msgid "max size of message (bytes) = %d\n" msgstr "mida màx. del missatge (octets) = %d\n" -#: sys-utils/ipcs.c:504 +#: sys-utils/ipcs.c:507 #, c-format msgid "default max size of queue (bytes) = %d\n" msgstr "mida màx. per defecte de la cua (octets) = %d\n" -#: sys-utils/ipcs.c:508 +#: sys-utils/ipcs.c:511 msgid "------ Messages: Status --------\n" msgstr "------ Missatges: estat --------\n" -#: sys-utils/ipcs.c:509 +#: sys-utils/ipcs.c:512 #, c-format msgid "allocated queues = %d\n" msgstr "cues assignades = %d\n" -#: sys-utils/ipcs.c:510 +#: sys-utils/ipcs.c:513 #, c-format msgid "used headers = %d\n" msgstr "capçaleres usades = %d\n" -#: sys-utils/ipcs.c:511 +#: sys-utils/ipcs.c:514 #, c-format msgid "used space = %d bytes\n" msgstr "espai emprat = %d octets\n" -#: sys-utils/ipcs.c:515 +#: sys-utils/ipcs.c:518 msgid "------ Message Queues: Creators/Owners --------\n" msgstr "--- Cues de missatges: creadors/propietaris ---\n" -#: sys-utils/ipcs.c:517 sys-utils/ipcs.c:523 sys-utils/ipcs.c:529 -#: sys-utils/ipcs.c:535 +#: sys-utils/ipcs.c:520 sys-utils/ipcs.c:526 sys-utils/ipcs.c:532 +#: sys-utils/ipcs.c:538 msgid "msqid" msgstr "msqid" -#: sys-utils/ipcs.c:521 +#: sys-utils/ipcs.c:524 msgid "------ Message Queues Send/Recv/Change Times --------\n" msgstr "--- Temps tramesa./recep./modific. cues de missatges ---\n" -#: sys-utils/ipcs.c:522 +#: sys-utils/ipcs.c:525 #, c-format msgid "%-8s %-10s %-20s %-20s %-20s\n" msgstr "%-8s %-10s %-20s %-20s %-20s\n" -#: sys-utils/ipcs.c:523 +#: sys-utils/ipcs.c:526 msgid "send" msgstr "tramesa" -#: sys-utils/ipcs.c:523 +#: sys-utils/ipcs.c:526 msgid "recv" msgstr "recepció" -#: sys-utils/ipcs.c:523 +#: sys-utils/ipcs.c:526 msgid "change" msgstr "modificació" -#: sys-utils/ipcs.c:527 +#: sys-utils/ipcs.c:530 msgid "------ Message Queues PIDs --------\n" msgstr "-- Els PID de les cues de missatges --\n" -#: sys-utils/ipcs.c:529 +#: sys-utils/ipcs.c:532 msgid "lspid" msgstr "lspid" -#: sys-utils/ipcs.c:529 +#: sys-utils/ipcs.c:532 msgid "lrpid" msgstr "lrpid" -#: sys-utils/ipcs.c:533 +#: sys-utils/ipcs.c:536 msgid "------ Message Queues --------\n" msgstr "------ Cues de missatges -----\n" -#: sys-utils/ipcs.c:534 +#: sys-utils/ipcs.c:537 #, c-format msgid "%-10s %-10s %-10s %-10s %-12s %-12s\n" msgstr "%-10s %-10s %-10s %-10s %-12s %-12s\n" -#: sys-utils/ipcs.c:536 +#: sys-utils/ipcs.c:539 msgid "used-bytes" msgstr "octets emprats" -#: sys-utils/ipcs.c:536 +#: sys-utils/ipcs.c:539 msgid "messages" msgstr "missatges" -#: sys-utils/ipcs.c:604 +#: sys-utils/ipcs.c:607 #, c-format msgid "" "\n" @@ -9151,37 +9156,37 @@ msgstr "" "\n" "Segment de la memòria compartida shmid=%d\n" -#: sys-utils/ipcs.c:605 +#: sys-utils/ipcs.c:608 #, c-format msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n" msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n" -#: sys-utils/ipcs.c:607 +#: sys-utils/ipcs.c:610 #, c-format msgid "mode=%#o\taccess_perms=%#o\n" msgstr "mode=%#o\taccess_perms=%#o\n" -#: sys-utils/ipcs.c:609 -#, c-format -msgid "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n" +#: sys-utils/ipcs.c:612 +#, fuzzy, c-format +msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n" msgstr "octets=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n" -#: sys-utils/ipcs.c:612 +#: sys-utils/ipcs.c:615 #, c-format msgid "att_time=%-26.24s\n" msgstr "att_time=%-26.24s\n" -#: sys-utils/ipcs.c:614 +#: sys-utils/ipcs.c:617 #, c-format msgid "det_time=%-26.24s\n" msgstr "det_time=%-26.24s\n" -#: sys-utils/ipcs.c:616 sys-utils/ipcs.c:647 +#: sys-utils/ipcs.c:619 sys-utils/ipcs.c:650 #, c-format msgid "change_time=%-26.24s\n" msgstr "change_time=%-26.24s\n" -#: sys-utils/ipcs.c:631 +#: sys-utils/ipcs.c:634 #, c-format msgid "" "\n" @@ -9190,27 +9195,27 @@ msgstr "" "\n" "Cua de missatges msqid=%d\n" -#: sys-utils/ipcs.c:632 +#: sys-utils/ipcs.c:635 #, c-format msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n" msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n" -#: sys-utils/ipcs.c:634 +#: sys-utils/ipcs.c:637 #, c-format msgid "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n" msgstr "coctets=%ld\tqoctets=%ld\tqnùm=%ld\tlspid=%d\tlrpid=%d\n" -#: sys-utils/ipcs.c:643 +#: sys-utils/ipcs.c:646 #, c-format msgid "send_time=%-26.24s\n" msgstr "send_time=%-26.24s\n" -#: sys-utils/ipcs.c:645 +#: sys-utils/ipcs.c:648 #, c-format msgid "rcv_time=%-26.24s\n" msgstr "rcv_time=%-26.24s\n" -#: sys-utils/ipcs.c:665 +#: sys-utils/ipcs.c:668 #, c-format msgid "" "\n" @@ -9219,48 +9224,48 @@ msgstr "" "\n" "semid de la matriu del semàfor=%d\n" -#: sys-utils/ipcs.c:666 +#: sys-utils/ipcs.c:669 #, c-format msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n" msgstr "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n" -#: sys-utils/ipcs.c:668 +#: sys-utils/ipcs.c:671 #, c-format msgid "mode=%#o, access_perms=%#o\n" msgstr "mode=%#o, access_perms=%#o\n" -#: sys-utils/ipcs.c:670 +#: sys-utils/ipcs.c:673 #, c-format msgid "nsems = %ld\n" msgstr "nsems = %ld\n" -#: sys-utils/ipcs.c:671 +#: sys-utils/ipcs.c:674 #, c-format msgid "otime = %-26.24s\n" msgstr "otime = %-26.24s\n" -#: sys-utils/ipcs.c:673 +#: sys-utils/ipcs.c:676 #, c-format msgid "ctime = %-26.24s\n" msgstr "ctime = %-26.24s\n" -#: sys-utils/ipcs.c:676 +#: sys-utils/ipcs.c:679 msgid "semnum" msgstr "semnum" -#: sys-utils/ipcs.c:676 +#: sys-utils/ipcs.c:679 msgid "value" msgstr "valor" -#: sys-utils/ipcs.c:676 +#: sys-utils/ipcs.c:679 msgid "ncount" msgstr "ncount" -#: sys-utils/ipcs.c:676 +#: sys-utils/ipcs.c:679 msgid "zcount" msgstr "zcount" -#: sys-utils/ipcs.c:676 +#: sys-utils/ipcs.c:679 msgid "pid" msgstr "pid" @@ -9540,12 +9545,12 @@ msgstr "" "hexdump: [-bcCdovx] [-e fmt] [-f fitxer_fmt] [-n longitud] [-s ometre] " "[fitxer ...]\n" -#: text-utils/more.c:264 +#: text-utils/more.c:263 #, c-format msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n" msgstr "useu: %s [-dflpcsu] [+núm_línies | +/patró] nom1 nom2 ...\n" -#: text-utils/more.c:522 +#: text-utils/more.c:521 #, c-format msgid "" "\n" @@ -9557,7 +9562,7 @@ msgstr "" "\n" #. simple ELF detection -#: text-utils/more.c:565 +#: text-utils/more.c:564 #, c-format msgid "" "\n" @@ -9568,43 +9573,43 @@ msgstr "" "**** %s: No és un fitxer de text ****\n" "\n" -#: text-utils/more.c:668 +#: text-utils/more.c:667 msgid "[Use q or Q to quit]" msgstr "[Usar q o Q per a sortir]" -#: text-utils/more.c:848 +#: text-utils/more.c:847 msgid "--More--" msgstr "--Més--" -#: text-utils/more.c:850 +#: text-utils/more.c:849 #, c-format msgid "(Next file: %s)" msgstr "(Següent fitxer: %s)" -#: text-utils/more.c:856 +#: text-utils/more.c:855 msgid "[Press space to continue, 'q' to quit.]" msgstr "[Pressionar la barra espaiadora per a continuar; 'q' per a sortir.]" -#: text-utils/more.c:1271 +#: text-utils/more.c:1269 #, c-format msgid "...back %d pages" msgstr "...retrocedir %d pàgines" -#: text-utils/more.c:1273 +#: text-utils/more.c:1271 msgid "...back 1 page" msgstr "...retrocedir 1 pàgina" -#: text-utils/more.c:1315 +#: text-utils/more.c:1313 #, fuzzy msgid "...skipping one line" msgstr "...ometent la línia %d" -#: text-utils/more.c:1317 +#: text-utils/more.c:1315 #, fuzzy, c-format msgid "...skipping %d lines" msgstr "...ometent la línia %d" -#: text-utils/more.c:1354 +#: text-utils/more.c:1352 msgid "" "\n" "***Back***\n" @@ -9614,37 +9619,64 @@ msgstr "" "***Endarrera***\n" "\n" -#: text-utils/more.c:1411 -msgid "Can't open help file" -msgstr "No es pot obrir el fitxer d'ajuda" +#: text-utils/more.c:1390 +msgid "" +"\n" +"Most commands optionally preceded by integer argument k. Defaults in " +"brackets.\n" +"Star (*) indicates argument becomes new default.\n" +msgstr "" + +#: text-utils/more.c:1395 +msgid "" +"\t\t\tDisplay next k lines of text [current screen size]\n" +"z\t\t\tDisplay next k lines of text [current screen size]*\n" +"\t\tDisplay next k lines of text [1]*\n" +"d or ctrl-D\t\tScroll k lines [current scroll size, initially 11]*\n" +"q or Q or \tExit from more\n" +"s\t\t\tSkip forward k lines of text [1]\n" +"f\t\t\tSkip forward k screenfuls of text [1]\n" +"b or ctrl-B\t\tSkip backwards k screenfuls of text [1]\n" +"'\t\t\tGo to place where previous search started\n" +"=\t\t\tDisplay current line number\n" +"/\tSearch for kth occurrence of regular expression [1]\n" +"n\t\t\tSearch for kth occurrence of last r.e [1]\n" +"! or :!\tExecute in a subshell\n" +"v\t\t\tStart up /usr/bin/vi at current line\n" +"ctrl-L\t\t\tRedraw screen\n" +":n\t\t\tGo to kth next file [1]\n" +":p\t\t\tGo to kth previous file [1]\n" +":f\t\t\tDisplay current file name and line number\n" +".\t\t\tRepeat previous command\n" +msgstr "" -#: text-utils/more.c:1441 text-utils/more.c:1446 +#: text-utils/more.c:1445 text-utils/more.c:1450 msgid "[Press 'h' for instructions.]" msgstr "[Prémer 'h' per a les instruccions.]" -#: text-utils/more.c:1480 +#: text-utils/more.c:1484 #, c-format msgid "\"%s\" line %d" msgstr "\"%s\" línia %d" -#: text-utils/more.c:1482 +#: text-utils/more.c:1486 #, c-format msgid "[Not a file] line %d" msgstr "[No és un fitxer] línia %d" -#: text-utils/more.c:1566 +#: text-utils/more.c:1570 msgid " Overflow\n" msgstr " Desbordament\n" -#: text-utils/more.c:1613 +#: text-utils/more.c:1617 msgid "...skipping\n" msgstr "...ometent\n" -#: text-utils/more.c:1643 +#: text-utils/more.c:1647 msgid "Regular expression botch" msgstr "Error en l'expressió regular" -#: text-utils/more.c:1655 +#: text-utils/more.c:1659 msgid "" "\n" "Pattern not found\n" @@ -9652,15 +9684,15 @@ msgstr "" "\n" "Patró no trobat\n" -#: text-utils/more.c:1658 text-utils/pg.c:1141 text-utils/pg.c:1292 +#: text-utils/more.c:1662 text-utils/pg.c:1141 text-utils/pg.c:1292 msgid "Pattern not found" msgstr "Patró no trobat" -#: text-utils/more.c:1719 +#: text-utils/more.c:1723 msgid "can't fork\n" msgstr "no es pot establir el canvi\n" -#: text-utils/more.c:1758 +#: text-utils/more.c:1762 msgid "" "\n" "...Skipping " @@ -9668,19 +9700,19 @@ msgstr "" "\n" "...Saltant " -#: text-utils/more.c:1763 +#: text-utils/more.c:1767 msgid "...Skipping to file " msgstr "...Saltant al fitxer " -#: text-utils/more.c:1765 +#: text-utils/more.c:1769 msgid "...Skipping back to file " msgstr "...Retrocedint al fitxer " -#: text-utils/more.c:2045 +#: text-utils/more.c:2049 msgid "Line too long" msgstr "Línia massa llarga" -#: text-utils/more.c:2088 +#: text-utils/more.c:2092 msgid "No previous command to substitute for" msgstr "No hi ha cap comandament previ a substituir" @@ -9854,6 +9886,12 @@ msgstr "Línia d'entrada massa llarga.\n" msgid "Out of memory when growing buffer.\n" msgstr "Memòria esgotada a l'augmentar la mida de la memòria temporal.\n" +#~ msgid "Partition %i does not end on cylinder boundary:\n" +#~ msgstr "La partició %i no acaba en el límit del cilindre:\n" + +#~ msgid "Can't open help file" +#~ msgstr "No es pot obrir el fitxer d'ajuda" + #~ msgid "" #~ "\n" #~ "Disk %s: %d heads, %d sectors, %d cylinders\n" diff --git a/po/cat-id-tbl.c b/po/cat-id-tbl.c index a7b0b9f6..28f6663b 100644 --- a/po/cat-id-tbl.c +++ b/po/cat-id-tbl.c @@ -508,7 +508,7 @@ More than one primary partition is marked bootable. DOS MBR cannot boot this.", {"Cannot change the type of an empty partition", 431}, {"No more partitions", 432}, {"Illegal command", 433}, - {"Copyright (C) 1994-2000 Kevin E. Martin & aeb\n", 434}, + {"Copyright (C) 1994-2002 Kevin E. Martin & aeb\n", 434}, {"\ \n\ Usage:\n\ @@ -664,7 +664,7 @@ and partition 11 as entire volume (6)as IRIX expects it.\n\ {"Partition %d has different physical/logical endings:\n", 525}, {"Partition %i does not start on cylinder boundary:\n", 526}, {"should be (%d, %d, 1)\n", 527}, - {"Partition %i does not end on cylinder boundary:\n", 528}, + {"Partition %i does not end on cylinder boundary.\n", 528}, {"should be (%d, %d, %d)\n", 529}, {"\ \n\ @@ -1782,265 +1782,266 @@ Now you can turn off the power...", 1301}, {"exec of single user shell failed\n", 1321}, {"fork of single user shell failed\n", 1322}, {"error opening fifo\n", 1323}, - {"error running finalprog\n", 1324}, - {"error forking finalprog\n", 1325}, + {"error setting close-on-exec on /dev/initctl", 1324}, + {"error running finalprog\n", 1325}, + {"error forking finalprog\n", 1326}, {"\ \n\ -Wrong password.\n", 1326}, - {"lstat of path failed\n", 1327}, - {"stat of path failed\n", 1328}, - {"open of directory failed\n", 1329}, - {"fork failed\n", 1330}, - {"exec failed\n", 1331}, - {"cannot open inittab\n", 1332}, - {"no TERM or cannot stat tty\n", 1333}, - {"error stopping service: \"%s\"", 1334}, - {"too many iov's (change code in wall/ttymsg.c)", 1335}, - {"excessively long line arg", 1336}, - {"cannot fork", 1337}, - {"fork: %s", 1338}, - {"%s: BAD ERROR", 1339}, - {"%s: the password file is busy.\n", 1340}, - {"%s: the group file is busy.\n", 1341}, - {"%s: the %s file is busy (%s present)\n", 1342}, - {"%s: can't link %s: %s\n", 1343}, - {"%s: can't unlock %s: %s (your changes are still in %s)\n", 1344}, - {"%s: Cannot fork\n", 1345}, - {"%s: %s unchanged\n", 1346}, - {"%s: no changes made\n", 1347}, - {"You are using shadow groups on this system.\n", 1348}, - {"You are using shadow passwords on this system.\n", 1349}, - {"Would you like to edit %s now [y/n]? ", 1350}, - {"usage: %s [file]\n", 1351}, - {"%s: can't open temporary file.\n", 1352}, - {"Broadcast Message from %s@%s", 1353}, - {"%s: will not read %s - use stdin.\n", 1354}, - {"%s: can't read %s.\n", 1355}, - {"%s: can't stat temporary file.\n", 1356}, - {"%s: can't read temporary file.\n", 1357}, - {"illegal month value: use 1-12", 1358}, - {"illegal year value: use 1-9999", 1359}, - {"%s %d", 1360}, - {"usage: cal [-13smjyV] [[month] year]\n", 1361}, - {"usage: %s [+format] [day month year]\n", 1362}, - {"St. Tib's Day", 1363}, - {"%s: unknown signal %s\n", 1364}, - {"%s: can't find process \"%s\"\n", 1365}, - {"%s: unknown signal %s; valid signals:\n", 1366}, - {"usage: %s [ -s signal | -p ] [ -a ] pid ...\n", 1367}, - {" %s -l [ signal ]\n", 1368}, - {"logger: %s: %s.\n", 1369}, - {"logger: unknown facility name: %s.\n", 1370}, - {"logger: unknown priority name: %s.\n", 1371}, - {"\ -usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n", 1372}, - {"usage: look [-dfa] [-t char] string [file]\n", 1373}, - {"Could not open %s\n", 1374}, - {"Got %d bytes from %s\n", 1375}, - {"namei: unable to get current directory - %s\n", 1376}, - {"namei: unable to chdir to %s - %s (%d)\n", 1377}, - {"usage: namei [-mx] pathname [pathname ...]\n", 1378}, - {"namei: could not chdir to root!\n", 1379}, - {"namei: could not stat root!\n", 1380}, - {"namei: buf overflow\n", 1381}, - {" ? could not chdir into %s - %s (%d)\n", 1382}, - {" ? problems reading symlink %s - %s (%d)\n", 1383}, - {" *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n", 1384}, - {"namei: unknown file type 0%06o on file %s\n", 1385}, - {"%s: out of memory\n", 1386}, - {"%s: renaming %s to %s failed: %s\n", 1387}, - {"call: %s from to files...\n", 1388}, +Wrong password.\n", 1327}, + {"lstat of path failed\n", 1328}, + {"stat of path failed\n", 1329}, + {"open of directory failed\n", 1330}, + {"fork failed\n", 1331}, + {"exec failed\n", 1332}, + {"cannot open inittab\n", 1333}, + {"no TERM or cannot stat tty\n", 1334}, + {"error stopping service: \"%s\"", 1335}, + {"too many iov's (change code in wall/ttymsg.c)", 1336}, + {"excessively long line arg", 1337}, + {"cannot fork", 1338}, + {"fork: %s", 1339}, + {"%s: BAD ERROR", 1340}, + {"%s: the password file is busy.\n", 1341}, + {"%s: the group file is busy.\n", 1342}, + {"%s: the %s file is busy (%s present)\n", 1343}, + {"%s: can't link %s: %s\n", 1344}, + {"%s: can't unlock %s: %s (your changes are still in %s)\n", 1345}, + {"%s: Cannot fork\n", 1346}, + {"%s: %s unchanged\n", 1347}, + {"%s: no changes made\n", 1348}, + {"You are using shadow groups on this system.\n", 1349}, + {"You are using shadow passwords on this system.\n", 1350}, + {"Would you like to edit %s now [y/n]? ", 1351}, + {"usage: %s [file]\n", 1352}, + {"%s: can't open temporary file.\n", 1353}, + {"Broadcast Message from %s@%s", 1354}, + {"%s: will not read %s - use stdin.\n", 1355}, + {"%s: can't read %s.\n", 1356}, + {"%s: can't stat temporary file.\n", 1357}, + {"%s: can't read temporary file.\n", 1358}, + {"illegal month value: use 1-12", 1359}, + {"illegal year value: use 1-9999", 1360}, + {"%s %d", 1361}, + {"usage: cal [-13smjyV] [[month] year]\n", 1362}, + {"usage: %s [+format] [day month year]\n", 1363}, + {"St. Tib's Day", 1364}, + {"%s: unknown signal %s\n", 1365}, + {"%s: can't find process \"%s\"\n", 1366}, + {"%s: unknown signal %s; valid signals:\n", 1367}, + {"usage: %s [ -s signal | -p ] [ -a ] pid ...\n", 1368}, + {" %s -l [ signal ]\n", 1369}, + {"logger: %s: %s.\n", 1370}, + {"logger: unknown facility name: %s.\n", 1371}, + {"logger: unknown priority name: %s.\n", 1372}, + {"\ +usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n", 1373}, + {"usage: look [-dfa] [-t char] string [file]\n", 1374}, + {"Could not open %s\n", 1375}, + {"Got %d bytes from %s\n", 1376}, + {"namei: unable to get current directory - %s\n", 1377}, + {"namei: unable to chdir to %s - %s (%d)\n", 1378}, + {"usage: namei [-mx] pathname [pathname ...]\n", 1379}, + {"namei: could not chdir to root!\n", 1380}, + {"namei: could not stat root!\n", 1381}, + {"namei: buf overflow\n", 1382}, + {" ? could not chdir into %s - %s (%d)\n", 1383}, + {" ? problems reading symlink %s - %s (%d)\n", 1384}, + {" *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n", 1385}, + {"namei: unknown file type 0%06o on file %s\n", 1386}, + {"%s: out of memory\n", 1387}, + {"%s: renaming %s to %s failed: %s\n", 1388}, + {"call: %s from to files...\n", 1389}, {"\ Warning: `%s' is a link.\n\ Use `%s [options] %s' if you really want to use it.\n\ -Script not started.\n", 1389}, - {"usage: script [-a] [-f] [-q] [-t] [file]\n", 1390}, - {"Script started, file is %s\n", 1391}, - {"Script started on %s", 1392}, +Script not started.\n", 1390}, + {"usage: script [-a] [-f] [-q] [-t] [file]\n", 1391}, + {"Script started, file is %s\n", 1392}, + {"Script started on %s", 1393}, {"\ \n\ -Script done on %s", 1393}, - {"Script done, file is %s\n", 1394}, - {"openpty failed\n", 1395}, - {"Out of pty's\n", 1396}, - {"%s: Argument error, usage\n", 1397}, - {" [ -term terminal_name ]\n", 1398}, - {" [ -reset ]\n", 1399}, - {" [ -initialize ]\n", 1400}, - {" [ -cursor [on|off] ]\n", 1401}, - {" [ -snow [on|off] ]\n", 1402}, - {" [ -softscroll [on|off] ]\n", 1403}, - {" [ -repeat [on|off] ]\n", 1404}, - {" [ -appcursorkeys [on|off] ]\n", 1405}, - {" [ -linewrap [on|off] ]\n", 1406}, - {" [ -default ]\n", 1407}, - {" [ -foreground black|blue|green|cyan", 1408}, - {"|red|magenta|yellow|white|default ]\n", 1409}, - {" [ -background black|blue|green|cyan", 1410}, - {" [ -ulcolor black|grey|blue|green|cyan", 1411}, - {"|red|magenta|yellow|white ]\n", 1412}, - {" [ -ulcolor bright blue|green|cyan", 1413}, - {" [ -hbcolor black|grey|blue|green|cyan", 1414}, - {" [ -hbcolor bright blue|green|cyan", 1415}, - {" [ -standout [ attr ] ]\n", 1416}, - {" [ -inversescreen [on|off] ]\n", 1417}, - {" [ -bold [on|off] ]\n", 1418}, - {" [ -half-bright [on|off] ]\n", 1419}, - {" [ -blink [on|off] ]\n", 1420}, - {" [ -reverse [on|off] ]\n", 1421}, - {" [ -underline [on|off] ]\n", 1422}, - {" [ -store ]\n", 1423}, - {" [ -clear [all|rest] ]\n", 1424}, - {" [ -tabs [ tab1 tab2 tab3 ... ] ] (tabn = 1-160)\n", 1425}, - {" [ -clrtabs [ tab1 tab2 tab3 ... ] ] (tabn = 1-160)\n", 1426}, - {" [ -regtabs [1-160] ]\n", 1427}, - {" [ -blank [0-60] ]\n", 1428}, - {" [ -dump [1-NR_CONSOLES] ]\n", 1429}, - {" [ -append [1-NR_CONSOLES] ]\n", 1430}, - {" [ -file dumpfilename ]\n", 1431}, - {" [ -msg [on|off] ]\n", 1432}, - {" [ -msglevel [0-8] ]\n", 1433}, - {" [ -powersave [on|vsync|hsync|powerdown|off] ]\n", 1434}, - {" [ -powerdown [0-60] ]\n", 1435}, - {" [ -blength [0-2000] ]\n", 1436}, - {" [ -bfreq freqnumber ]\n", 1437}, - {"cannot (un)set powersave mode\n", 1438}, - {"klogctl error: %s\n", 1439}, - {"Error reading %s\n", 1440}, - {"Error writing screendump\n", 1441}, - {"couldn't read %s, and cannot ioctl dump\n", 1442}, - {"%s: $TERM is not defined.\n", 1443}, - {"whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n", 1444}, - {"write: can't find your tty's name\n", 1445}, - {"write: you have write permission turned off.\n", 1446}, - {"write: %s is not logged in on %s.\n", 1447}, - {"write: %s has messages disabled on %s\n", 1448}, - {"usage: write user [tty]\n", 1449}, - {"write: %s is not logged in\n", 1450}, - {"write: %s has messages disabled\n", 1451}, - {"write: %s is logged in more than once; writing to %s\n", 1452}, - {"Message from %s@%s (as %s) on %s at %s ...", 1453}, - {"Message from %s@%s on %s at %s ...", 1454}, - {"warning: error reading %s: %s", 1455}, - {"warning: can't open %s: %s", 1456}, - {"mount: could not open %s - using %s instead\n", 1457}, - {"can't create lock file %s: %s (use -n flag to override)", 1458}, - {"can't link lock file %s: %s (use -n flag to override)", 1459}, - {"can't open lock file %s: %s (use -n flag to override)", 1460}, - {"Can't lock lock file %s: %s\n", 1461}, - {"can't lock lock file %s: %s", 1462}, - {"timed out", 1463}, +Script done on %s", 1394}, + {"Script done, file is %s\n", 1395}, + {"openpty failed\n", 1396}, + {"Out of pty's\n", 1397}, + {"%s: Argument error, usage\n", 1398}, + {" [ -term terminal_name ]\n", 1399}, + {" [ -reset ]\n", 1400}, + {" [ -initialize ]\n", 1401}, + {" [ -cursor [on|off] ]\n", 1402}, + {" [ -snow [on|off] ]\n", 1403}, + {" [ -softscroll [on|off] ]\n", 1404}, + {" [ -repeat [on|off] ]\n", 1405}, + {" [ -appcursorkeys [on|off] ]\n", 1406}, + {" [ -linewrap [on|off] ]\n", 1407}, + {" [ -default ]\n", 1408}, + {" [ -foreground black|blue|green|cyan", 1409}, + {"|red|magenta|yellow|white|default ]\n", 1410}, + {" [ -background black|blue|green|cyan", 1411}, + {" [ -ulcolor black|grey|blue|green|cyan", 1412}, + {"|red|magenta|yellow|white ]\n", 1413}, + {" [ -ulcolor bright blue|green|cyan", 1414}, + {" [ -hbcolor black|grey|blue|green|cyan", 1415}, + {" [ -hbcolor bright blue|green|cyan", 1416}, + {" [ -standout [ attr ] ]\n", 1417}, + {" [ -inversescreen [on|off] ]\n", 1418}, + {" [ -bold [on|off] ]\n", 1419}, + {" [ -half-bright [on|off] ]\n", 1420}, + {" [ -blink [on|off] ]\n", 1421}, + {" [ -reverse [on|off] ]\n", 1422}, + {" [ -underline [on|off] ]\n", 1423}, + {" [ -store ]\n", 1424}, + {" [ -clear [all|rest] ]\n", 1425}, + {" [ -tabs [ tab1 tab2 tab3 ... ] ] (tabn = 1-160)\n", 1426}, + {" [ -clrtabs [ tab1 tab2 tab3 ... ] ] (tabn = 1-160)\n", 1427}, + {" [ -regtabs [1-160] ]\n", 1428}, + {" [ -blank [0-60] ]\n", 1429}, + {" [ -dump [1-NR_CONSOLES] ]\n", 1430}, + {" [ -append [1-NR_CONSOLES] ]\n", 1431}, + {" [ -file dumpfilename ]\n", 1432}, + {" [ -msg [on|off] ]\n", 1433}, + {" [ -msglevel [0-8] ]\n", 1434}, + {" [ -powersave [on|vsync|hsync|powerdown|off] ]\n", 1435}, + {" [ -powerdown [0-60] ]\n", 1436}, + {" [ -blength [0-2000] ]\n", 1437}, + {" [ -bfreq freqnumber ]\n", 1438}, + {"cannot (un)set powersave mode\n", 1439}, + {"klogctl error: %s\n", 1440}, + {"Error reading %s\n", 1441}, + {"Error writing screendump\n", 1442}, + {"couldn't read %s, and cannot ioctl dump\n", 1443}, + {"%s: $TERM is not defined.\n", 1444}, + {"whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n", 1445}, + {"write: can't find your tty's name\n", 1446}, + {"write: you have write permission turned off.\n", 1447}, + {"write: %s is not logged in on %s.\n", 1448}, + {"write: %s has messages disabled on %s\n", 1449}, + {"usage: write user [tty]\n", 1450}, + {"write: %s is not logged in\n", 1451}, + {"write: %s has messages disabled\n", 1452}, + {"write: %s is logged in more than once; writing to %s\n", 1453}, + {"Message from %s@%s (as %s) on %s at %s ...", 1454}, + {"Message from %s@%s on %s at %s ...", 1455}, + {"warning: error reading %s: %s", 1456}, + {"warning: can't open %s: %s", 1457}, + {"mount: could not open %s - using %s instead\n", 1458}, + {"can't create lock file %s: %s (use -n flag to override)", 1459}, + {"can't link lock file %s: %s (use -n flag to override)", 1460}, + {"can't open lock file %s: %s (use -n flag to override)", 1461}, + {"Can't lock lock file %s: %s\n", 1462}, + {"can't lock lock file %s: %s", 1463}, + {"timed out", 1464}, {"\ Cannot create link %s\n\ -Perhaps there is a stale lock file?\n", 1464}, - {"cannot open %s (%s) - mtab not updated", 1465}, - {"error writing %s: %s", 1466}, - {"error changing mode of %s: %s\n", 1467}, - {"can't rename %s to %s: %s\n", 1468}, - {"loop: can't open device %s: %s\n", 1469}, - {"loop: can't get info on device %s: %s\n", 1470}, - {"%s: [%04x]:%ld (%s) offset %d, %s encryption\n", 1471}, - {"mount: could not find any device /dev/loop#", 1472}, +Perhaps there is a stale lock file?\n", 1465}, + {"cannot open %s (%s) - mtab not updated", 1466}, + {"error writing %s: %s", 1467}, + {"error changing mode of %s: %s\n", 1468}, + {"can't rename %s to %s: %s\n", 1469}, + {"loop: can't open device %s: %s\n", 1470}, + {"loop: can't get info on device %s: %s\n", 1471}, + {"%s: [%04x]:%ld (%s) offset %d, %s encryption\n", 1472}, + {"mount: could not find any device /dev/loop#", 1473}, {"\ mount: Could not find any loop device.\n\ - Maybe /dev/loop# has a wrong major number?", 1473}, + Maybe /dev/loop# has a wrong major number?", 1474}, {"\ 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'.)", 1474}, + (If so, then recompile or `insmod loop.o'.)", 1475}, {"\ 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?", 1475}, - {"mount: could not find any free loop device", 1476}, - {"Unsupported encryption type %s\n", 1477}, - {"Couldn't lock into memory, exiting.\n", 1478}, - {"Init (up to 16 hex digits): ", 1479}, - {"Non-hex digit '%c'.\n", 1480}, - {"Don't know how to get key for encryption system %d\n", 1481}, - {"set_loop(%s,%s,%d): success\n", 1482}, - {"loop: can't delete device %s: %s\n", 1483}, - {"del_loop(%s): success\n", 1484}, - {"This mount was compiled without loop support. Please recompile.\n", 1485}, + maybe /dev/loop# has the wrong major number?", 1476}, + {"mount: could not find any free loop device", 1477}, + {"Unsupported encryption type %s\n", 1478}, + {"Couldn't lock into memory, exiting.\n", 1479}, + {"Init (up to 16 hex digits): ", 1480}, + {"Non-hex digit '%c'.\n", 1481}, + {"Don't know how to get key for encryption system %d\n", 1482}, + {"set_loop(%s,%s,%d): success\n", 1483}, + {"loop: can't delete device %s: %s\n", 1484}, + {"del_loop(%s): success\n", 1485}, + {"This mount was compiled without loop support. Please recompile.\n", 1486}, {"\ usage:\n\ %s loop_device # give info\n\ %s -d loop_device # delete\n\ - %s [ -e encryption ] [ -o offset ] loop_device file # setup\n", 1486}, - {"not enough memory", 1487}, - {"No loop support was available at compile time. Please recompile.\n", 1488}, - {"[mntent]: warning: no final newline at the end of %s\n", 1489}, - {"[mntent]: line %d in %s is bad%s\n", 1490}, - {"; rest of file ignored", 1491}, - {"mount: according to mtab, %s is already mounted on %s", 1492}, - {"mount: according to mtab, %s is mounted on %s", 1493}, - {"mount: can't open %s for writing: %s", 1494}, - {"mount: error writing %s: %s", 1495}, - {"mount: error changing mode of %s: %s", 1496}, - {"%s looks like swapspace - not mounted", 1497}, - {"mount failed", 1498}, - {"mount: only root can mount %s on %s", 1499}, - {"mount: loop device specified twice", 1500}, - {"mount: type specified twice", 1501}, - {"mount: skipping the setup of a loop device\n", 1502}, - {"mount: going to use the loop device %s\n", 1503}, - {"mount: failed setting up loop device\n", 1504}, - {"mount: setup loop device successfully\n", 1505}, - {"mount: can't open %s: %s", 1506}, - {"mount: cannot open %s for setting speed", 1507}, - {"mount: cannot set speed: %s", 1508}, - {"mount: cannot fork: %s", 1509}, - {"mount: this version was compiled without support for the type `nfs'", 1510}, - {"mount: failed with nfs mount version 4, trying 3..\n", 1511}, - {"\ -mount: I could not determine the filesystem type, and none was specified", 1512}, - {"mount: you must specify the filesystem type", 1513}, - {"mount: mount failed", 1514}, - {"mount: mount point %s is not a directory", 1515}, - {"mount: permission denied", 1516}, - {"mount: must be superuser to use mount", 1517}, - {"mount: %s is busy", 1518}, - {"mount: proc already mounted", 1519}, - {"mount: %s already mounted or %s busy", 1520}, - {"mount: mount point %s does not exist", 1521}, - {"mount: mount point %s is a symbolic link to nowhere", 1522}, - {"mount: special device %s does not exist", 1523}, + %s [ -e encryption ] [ -o offset ] loop_device file # setup\n", 1487}, + {"not enough memory", 1488}, + {"No loop support was available at compile time. Please recompile.\n", 1489}, + {"[mntent]: warning: no final newline at the end of %s\n", 1490}, + {"[mntent]: line %d in %s is bad%s\n", 1491}, + {"; rest of file ignored", 1492}, + {"mount: according to mtab, %s is already mounted on %s", 1493}, + {"mount: according to mtab, %s is mounted on %s", 1494}, + {"mount: can't open %s for writing: %s", 1495}, + {"mount: error writing %s: %s", 1496}, + {"mount: error changing mode of %s: %s", 1497}, + {"%s looks like swapspace - not mounted", 1498}, + {"mount failed", 1499}, + {"mount: only root can mount %s on %s", 1500}, + {"mount: loop device specified twice", 1501}, + {"mount: type specified twice", 1502}, + {"mount: skipping the setup of a loop device\n", 1503}, + {"mount: going to use the loop device %s\n", 1504}, + {"mount: failed setting up loop device\n", 1505}, + {"mount: setup loop device successfully\n", 1506}, + {"mount: can't open %s: %s", 1507}, + {"mount: cannot open %s for setting speed", 1508}, + {"mount: cannot set speed: %s", 1509}, + {"mount: cannot fork: %s", 1510}, + {"mount: this version was compiled without support for the type `nfs'", 1511}, + {"mount: failed with nfs mount version 4, trying 3..\n", 1512}, + {"\ +mount: I could not determine the filesystem type, and none was specified", 1513}, + {"mount: you must specify the filesystem type", 1514}, + {"mount: mount failed", 1515}, + {"mount: mount point %s is not a directory", 1516}, + {"mount: permission denied", 1517}, + {"mount: must be superuser to use mount", 1518}, + {"mount: %s is busy", 1519}, + {"mount: proc already mounted", 1520}, + {"mount: %s already mounted or %s busy", 1521}, + {"mount: mount point %s does not exist", 1522}, + {"mount: mount point %s is a symbolic link to nowhere", 1523}, + {"mount: special device %s does not exist", 1524}, {"\ mount: special device %s does not exist\n\ - (a path prefix is not a directory)\n", 1524}, - {"mount: %s not mounted already, or bad option", 1525}, + (a path prefix is not a directory)\n", 1525}, + {"mount: %s not mounted already, or bad option", 1526}, {"\ mount: wrong fs type, bad option, bad superblock on %s,\n\ - or too many mounted file systems", 1526}, - {"mount table full", 1527}, - {"mount: %s: can't read superblock", 1528}, - {"mount: %s: unknown device", 1529}, - {"mount: fs type %s not supported by kernel", 1530}, - {"mount: probably you meant %s", 1531}, - {"mount: maybe you meant iso9660 ?", 1532}, - {"mount: %s has wrong device number or fs type %s not supported", 1533}, - {"mount: %s is not a block device, and stat fails?", 1534}, + or too many mounted file systems", 1527}, + {"mount table full", 1528}, + {"mount: %s: can't read superblock", 1529}, + {"mount: %s: unknown device", 1530}, + {"mount: fs type %s not supported by kernel", 1531}, + {"mount: probably you meant %s", 1532}, + {"mount: maybe you meant iso9660 ?", 1533}, + {"mount: %s has wrong device number or fs type %s not supported", 1534}, + {"mount: %s is not a block device, and stat fails?", 1535}, {"\ mount: the kernel does not recognize %s as a block device\n\ - (maybe `insmod driver'?)", 1535}, - {"mount: %s is not a block device (maybe try `-o loop'?)", 1536}, - {"mount: %s is not a block device", 1537}, - {"mount: %s is not a valid block device", 1538}, - {"block device ", 1539}, - {"mount: cannot mount %s%s read-only", 1540}, - {"mount: %s%s is write-protected but explicit `-w' flag given", 1541}, - {"mount: %s%s is write-protected, mounting read-only", 1542}, - {"mount: the label %s occurs on both %s and %s\n", 1543}, - {"mount: %s duplicate - not mounted", 1544}, - {"mount: going to mount %s by %s\n", 1545}, - {"UUID", 1546}, - {"label", 1547}, - {"mount: no such partition found", 1548}, - {"mount: no type was given - I'll assume nfs because of the colon\n", 1549}, - {"mount: no type was given - I'll assume smb because of the // prefix\n", 1550}, - {"mount: backgrounding \"%s\"\n", 1551}, - {"mount: giving up \"%s\"\n", 1552}, - {"mount: %s already mounted on %s\n", 1553}, + (maybe `insmod driver'?)", 1536}, + {"mount: %s is not a block device (maybe try `-o loop'?)", 1537}, + {"mount: %s is not a block device", 1538}, + {"mount: %s is not a valid block device", 1539}, + {"block device ", 1540}, + {"mount: cannot mount %s%s read-only", 1541}, + {"mount: %s%s is write-protected but explicit `-w' flag given", 1542}, + {"mount: %s%s is write-protected, mounting read-only", 1543}, + {"mount: the label %s occurs on both %s and %s\n", 1544}, + {"mount: %s duplicate - not mounted", 1545}, + {"mount: going to mount %s by %s\n", 1546}, + {"UUID", 1547}, + {"label", 1548}, + {"mount: no such partition found", 1549}, + {"mount: no type was given - I'll assume nfs because of the colon\n", 1550}, + {"mount: no type was given - I'll assume smb because of the // prefix\n", 1551}, + {"mount: backgrounding \"%s\"\n", 1552}, + {"mount: giving up \"%s\"\n", 1553}, + {"mount: %s already mounted on %s\n", 1554}, {"\ Usage: mount -V : print version\n\ mount -h : print this help\n\ @@ -2062,289 +2063,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", 1554}, - {"mount: only root can do that", 1555}, - {"mount: no %s found - creating it..\n", 1556}, - {"mount: the label %s occurs on both %s and %s - not mounted\n", 1557}, - {"mount: mounting %s\n", 1558}, - {"nothing was mounted", 1559}, - {"mount: cannot find %s in %s", 1560}, - {"mount: can't find %s in %s or %s", 1561}, - {"\ -mount: could not open %s, so UUID and LABEL conversion cannot be done.\n", 1562}, - {"mount: bad UUID", 1563}, - {"mount: error while guessing filesystem type\n", 1564}, - {"mount: you didn't specify a filesystem type for %s\n", 1565}, - {" I will try all types mentioned in %s or %s\n", 1566}, - {" and it looks like this is swapspace\n", 1567}, - {" I will try type %s\n", 1568}, - {"Trying %s\n", 1569}, - {"mount: excessively long host:dir argument\n", 1570}, - {"mount: warning: multiple hostnames not supported\n", 1571}, - {"mount: directory to mount not in host:dir format\n", 1572}, - {"mount: can't get address for %s\n", 1573}, - {"mount: got bad hp->h_length\n", 1574}, - {"mount: excessively long option argument\n", 1575}, - {"Warning: Unrecognized proto= option.\n", 1576}, - {"Warning: Option namlen is not supported.\n", 1577}, - {"unknown nfs mount parameter: %s=%d\n", 1578}, - {"Warning: option nolock is not supported.\n", 1579}, - {"unknown nfs mount option: %s%s\n", 1580}, - {"mount: got bad hp->h_length?\n", 1581}, - {"NFS over TCP is not supported.\n", 1582}, - {"nfs socket", 1583}, - {"nfs bindresvport", 1584}, - {"nfs server reported service unavailable", 1585}, - {"used portmapper to find NFS port\n", 1586}, - {"using port %d for nfs deamon\n", 1587}, - {"nfs connect", 1588}, - {"unknown nfs status return value: %d", 1589}, - {"bug in xstrndup call", 1590}, +For many more details, say man 8 mount .\n", 1555}, + {"mount: only root can do that", 1556}, + {"mount: no %s found - creating it..\n", 1557}, + {"mount: the label %s occurs on both %s and %s - not mounted\n", 1558}, + {"mount: mounting %s\n", 1559}, + {"nothing was mounted", 1560}, + {"mount: cannot find %s in %s", 1561}, + {"mount: can't find %s in %s or %s", 1562}, + {"\ +mount: could not open %s, so UUID and LABEL conversion cannot be done.\n", 1563}, + {"mount: bad UUID", 1564}, + {"mount: error while guessing filesystem type\n", 1565}, + {"mount: you didn't specify a filesystem type for %s\n", 1566}, + {" I will try all types mentioned in %s or %s\n", 1567}, + {" and it looks like this is swapspace\n", 1568}, + {" I will try type %s\n", 1569}, + {"Trying %s\n", 1570}, + {"mount: excessively long host:dir argument\n", 1571}, + {"mount: warning: multiple hostnames not supported\n", 1572}, + {"mount: directory to mount not in host:dir format\n", 1573}, + {"mount: can't get address for %s\n", 1574}, + {"mount: got bad hp->h_length\n", 1575}, + {"mount: excessively long option argument\n", 1576}, + {"Warning: Unrecognized proto= option.\n", 1577}, + {"Warning: Option namlen is not supported.\n", 1578}, + {"unknown nfs mount parameter: %s=%d\n", 1579}, + {"Warning: option nolock is not supported.\n", 1580}, + {"unknown nfs mount option: %s%s\n", 1581}, + {"mount: got bad hp->h_length?\n", 1582}, + {"NFS over TCP is not supported.\n", 1583}, + {"nfs socket", 1584}, + {"nfs bindresvport", 1585}, + {"nfs server reported service unavailable", 1586}, + {"used portmapper to find NFS port\n", 1587}, + {"using port %d for nfs deamon\n", 1588}, + {"nfs connect", 1589}, + {"unknown nfs status return value: %d", 1590}, + {"bug in xstrndup call", 1591}, {"\ usage: %s [-hV]\n\ %s -a [-e] [-v]\n\ %s [-v] [-p priority] special ...\n\ - %s [-s]\n", 1591}, + %s [-s]\n", 1592}, {"\ usage: %s [-hV]\n\ %s -a [-v]\n\ - %s [-v] special ...\n", 1592}, - {"%s on %s\n", 1593}, - {"swapon: cannot stat %s: %s\n", 1594}, - {"swapon: warning: %s has insecure permissions %04o, %04o suggested\n", 1595}, - {"swapon: Skipping file %s - it appears to have holes.\n", 1596}, - {"Not superuser.\n", 1597}, - {"%s: cannot open %s: %s\n", 1598}, - {"umount: compiled without support for -f\n", 1599}, - {"host: %s, directory: %s\n", 1600}, - {"umount: can't get address for %s\n", 1601}, - {"umount: got bad hostp->h_length\n", 1602}, - {"umount: %s: invalid block device", 1603}, - {"umount: %s: not mounted", 1604}, - {"umount: %s: can't write superblock", 1605}, - {"umount: %s: device is busy", 1606}, - {"umount: %s: not found", 1607}, - {"umount: %s: must be superuser to umount", 1608}, - {"umount: %s: block devices not permitted on fs", 1609}, - {"umount: %s: %s", 1610}, - {"no umount2, trying umount...\n", 1611}, - {"could not umount %s - trying %s instead\n", 1612}, - {"umount: %s busy - remounted read-only\n", 1613}, - {"umount: could not remount %s read-only\n", 1614}, - {"%s umounted\n", 1615}, - {"umount: cannot find list of filesystems to unmount", 1616}, + %s [-v] special ...\n", 1593}, + {"%s on %s\n", 1594}, + {"swapon: cannot stat %s: %s\n", 1595}, + {"swapon: warning: %s has insecure permissions %04o, %04o suggested\n", 1596}, + {"swapon: Skipping file %s - it appears to have holes.\n", 1597}, + {"Not superuser.\n", 1598}, + {"%s: cannot open %s: %s\n", 1599}, + {"umount: compiled without support for -f\n", 1600}, + {"host: %s, directory: %s\n", 1601}, + {"umount: can't get address for %s\n", 1602}, + {"umount: got bad hostp->h_length\n", 1603}, + {"umount: %s: invalid block device", 1604}, + {"umount: %s: not mounted", 1605}, + {"umount: %s: can't write superblock", 1606}, + {"umount: %s: device is busy", 1607}, + {"umount: %s: not found", 1608}, + {"umount: %s: must be superuser to umount", 1609}, + {"umount: %s: block devices not permitted on fs", 1610}, + {"umount: %s: %s", 1611}, + {"no umount2, trying umount...\n", 1612}, + {"could not umount %s - trying %s instead\n", 1613}, + {"umount: %s busy - remounted read-only\n", 1614}, + {"umount: could not remount %s read-only\n", 1615}, + {"%s umounted\n", 1616}, + {"umount: cannot find list of filesystems to unmount", 1617}, {"\ Usage: umount [-hV]\n\ umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n\ - umount [-f] [-r] [-n] [-v] special | node...\n", 1617}, - {"Trying to umount %s\n", 1618}, - {"Could not find %s in mtab\n", 1619}, - {"umount: %s is not mounted (according to mtab)", 1620}, - {"umount: it seems %s is mounted multiple times", 1621}, - {"umount: %s is not in the fstab (and you are not root)", 1622}, - {"umount: %s mount disagrees with the fstab", 1623}, - {"umount: only root can unmount %s from %s", 1624}, - {"umount: only root can do that", 1625}, - {"You must be root to set the Ctrl-Alt-Del behaviour.\n", 1626}, - {"Usage: ctrlaltdel hard|soft\n", 1627}, + umount [-f] [-r] [-n] [-v] special | node...\n", 1618}, + {"Trying to umount %s\n", 1619}, + {"Could not find %s in mtab\n", 1620}, + {"umount: %s is not mounted (according to mtab)", 1621}, + {"umount: it seems %s is mounted multiple times", 1622}, + {"umount: %s is not in the fstab (and you are not root)", 1623}, + {"umount: %s mount disagrees with the fstab", 1624}, + {"umount: only root can unmount %s from %s", 1625}, + {"umount: only root can do that", 1626}, + {"You must be root to set the Ctrl-Alt-Del behaviour.\n", 1627}, + {"Usage: ctrlaltdel hard|soft\n", 1628}, {"\ File %s, For threshold value %lu, Maximum characters in fifo were %d,\n\ -and the maximum transfer rate in characters/second was %f\n", 1628}, +and the maximum transfer rate in characters/second was %f\n", 1629}, {"\ 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", 1629}, - {"Invalid interval value: %s\n", 1630}, - {"Invalid set value: %s\n", 1631}, - {"Invalid default value: %s\n", 1632}, - {"Invalid set time value: %s\n", 1633}, - {"Invalid default time value: %s\n", 1634}, +and the maximum transfer rate in characters/second was %f\n", 1630}, + {"Invalid interval value: %s\n", 1631}, + {"Invalid set value: %s\n", 1632}, + {"Invalid default value: %s\n", 1633}, + {"Invalid set time value: %s\n", 1634}, + {"Invalid default time value: %s\n", 1635}, {"\ Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) \ -[-g|-G] file [file...]\n", 1635}, - {"Can't open %s: %s\n", 1636}, - {"Can't set %s to threshold %d: %s\n", 1637}, - {"Can't set %s to time threshold %d: %s\n", 1638}, - {"Can't get threshold for %s: %s\n", 1639}, - {"Can't get timeout for %s: %s\n", 1640}, - {"%s: %ld current threshold and %ld current timeout\n", 1641}, - {"%s: %ld default threshold and %ld default timeout\n", 1642}, - {"Can't set signal handler", 1643}, - {"gettimeofday failed", 1644}, - {"Can't issue CYGETMON on %s: %s\n", 1645}, - {"\ -%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n", 1646}, - {" %f int/sec; %f rec, %f send (char/sec)\n", 1647}, - {"\ -%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n", 1648}, - {" %f int/sec; %f rec (char/sec)\n", 1649}, - {"Usage: %s [-c] [-n level] [-s bufsize]\n", 1650}, - {"invalid id: %s\n", 1651}, - {"cannot remove id %s (%s)\n", 1652}, - {"deprecated usage: %s {shm | msg | sem} id ...\n", 1653}, - {"unknown resource type: %s\n", 1654}, - {"resource(s) deleted\n", 1655}, +[-g|-G] file [file...]\n", 1636}, + {"Can't open %s: %s\n", 1637}, + {"Can't set %s to threshold %d: %s\n", 1638}, + {"Can't set %s to time threshold %d: %s\n", 1639}, + {"Can't get threshold for %s: %s\n", 1640}, + {"Can't get timeout for %s: %s\n", 1641}, + {"%s: %ld current threshold and %ld current timeout\n", 1642}, + {"%s: %ld default threshold and %ld default timeout\n", 1643}, + {"Can't set signal handler", 1644}, + {"gettimeofday failed", 1645}, + {"Can't issue CYGETMON on %s: %s\n", 1646}, + {"\ +%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n", 1647}, + {" %f int/sec; %f rec, %f send (char/sec)\n", 1648}, + {"\ +%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n", 1649}, + {" %f int/sec; %f rec (char/sec)\n", 1650}, + {"Usage: %s [-c] [-n level] [-s bufsize]\n", 1651}, + {"invalid id: %s\n", 1652}, + {"cannot remove id %s (%s)\n", 1653}, + {"deprecated usage: %s {shm | msg | sem} id ...\n", 1654}, + {"unknown resource type: %s\n", 1655}, + {"resource(s) deleted\n", 1656}, {"\ usage: %s [ [-q msqid] [-m shmid] [-s semid]\n\ - [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n", 1656}, - {"%s: illegal option -- %c\n", 1657}, - {"%s: illegal key (%s)\n", 1658}, - {"permission denied for key", 1659}, - {"already removed key", 1660}, - {"invalid key", 1661}, - {"unknown error in key", 1662}, - {"permission denied for id", 1663}, - {"invalid id", 1664}, - {"already removed id", 1665}, - {"unknown error in id", 1666}, - {"%s: %s (%s)\n", 1667}, - {"%s: unknown argument: %s\n", 1668}, - {"usage : %s -asmq -tclup \n", 1669}, - {"\t%s [-s -m -q] -i id\n", 1670}, - {"\t%s -h for help.\n", 1671}, - {"\ -%s provides information on ipc facilities for which you have read access.\n", 1672}, + [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n", 1657}, + {"%s: illegal option -- %c\n", 1658}, + {"%s: illegal key (%s)\n", 1659}, + {"permission denied for key", 1660}, + {"already removed key", 1661}, + {"invalid key", 1662}, + {"unknown error in key", 1663}, + {"permission denied for id", 1664}, + {"invalid id", 1665}, + {"already removed id", 1666}, + {"unknown error in id", 1667}, + {"%s: %s (%s)\n", 1668}, + {"%s: unknown argument: %s\n", 1669}, + {"usage : %s -asmq -tclup \n", 1670}, + {"\t%s [-s -m -q] -i id\n", 1671}, + {"\t%s -h for help.\n", 1672}, + {"\ +%s provides information on ipc facilities for which you have read access.\n", 1673}, {"\ Resource Specification:\n\ \t-m : shared_mem\n\ -\t-q : messages\n", 1673}, +\t-q : messages\n", 1674}, {"\ \t-s : semaphores\n\ -\t-a : all (default)\n", 1674}, +\t-a : all (default)\n", 1675}, {"\ Output Format:\n\ \t-t : time\n\ \t-p : pid\n\ -\t-c : creator\n", 1675}, +\t-c : creator\n", 1676}, {"\ \t-l : limits\n\ -\t-u : summary\n", 1676}, - {"-i id [-s -q -m] : details on resource identified by id\n", 1677}, - {"kernel not configured for shared memory\n", 1678}, - {"------ Shared Memory Limits --------\n", 1679}, - {"max number of segments = %ld\n", 1680}, - {"max seg size (kbytes) = %ld\n", 1681}, - {"max total shared memory (kbytes) = %ld\n", 1682}, - {"min seg size (bytes) = %ld\n", 1683}, - {"------ Shared Memory Status --------\n", 1684}, - {"segments allocated %d\n", 1685}, - {"pages allocated %ld\n", 1686}, - {"pages resident %ld\n", 1687}, - {"pages swapped %ld\n", 1688}, - {"Swap performance: %ld attempts\t %ld successes\n", 1689}, - {"------ Shared Memory Segment Creators/Owners --------\n", 1690}, - {"%-10s %-10s %-10s %-10s %-10s %-10s\n", 1691}, - {"shmid", 1692}, - {"perms", 1693}, - {"cuid", 1694}, - {"cgid", 1695}, - {"uid", 1696}, - {"gid", 1697}, - {"------ Shared Memory Attach/Detach/Change Times --------\n", 1698}, - {"%-10s %-10s %-20s %-20s %-20s\n", 1699}, - {"owner", 1700}, - {"attached", 1701}, - {"detached", 1702}, - {"changed", 1703}, - {"------ Shared Memory Creator/Last-op --------\n", 1704}, - {"%-10s %-10s %-10s %-10s\n", 1705}, - {"cpid", 1706}, - {"lpid", 1707}, - {"------ Shared Memory Segments --------\n", 1708}, - {"%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n", 1709}, - {"key", 1710}, - {"bytes", 1711}, - {"nattch", 1712}, - {"status", 1713}, - {"Not set", 1714}, - {"dest", 1715}, - {"locked", 1716}, - {"kernel not configured for semaphores\n", 1717}, - {"------ Semaphore Limits --------\n", 1718}, - {"max number of arrays = %d\n", 1719}, - {"max semaphores per array = %d\n", 1720}, - {"max semaphores system wide = %d\n", 1721}, - {"max ops per semop call = %d\n", 1722}, - {"semaphore max value = %d\n", 1723}, - {"------ Semaphore Status --------\n", 1724}, - {"used arrays = %d\n", 1725}, - {"allocated semaphores = %d\n", 1726}, - {"------ Semaphore Arrays Creators/Owners --------\n", 1727}, - {"semid", 1728}, - {"------ Shared Memory Operation/Change Times --------\n", 1729}, - {"%-8s %-10s %-26.24s %-26.24s\n", 1730}, - {"last-op", 1731}, - {"last-changed", 1732}, - {"------ Semaphore Arrays --------\n", 1733}, - {"%-10s %-10s %-10s %-10s %-10s\n", 1734}, - {"nsems", 1735}, - {"kernel not configured for message queues\n", 1736}, - {"------ Messages: Limits --------\n", 1737}, - {"max queues system wide = %d\n", 1738}, - {"max size of message (bytes) = %d\n", 1739}, - {"default max size of queue (bytes) = %d\n", 1740}, - {"------ Messages: Status --------\n", 1741}, - {"allocated queues = %d\n", 1742}, - {"used headers = %d\n", 1743}, - {"used space = %d bytes\n", 1744}, - {"------ Message Queues: Creators/Owners --------\n", 1745}, - {"msqid", 1746}, - {"------ Message Queues Send/Recv/Change Times --------\n", 1747}, - {"%-8s %-10s %-20s %-20s %-20s\n", 1748}, - {"send", 1749}, - {"recv", 1750}, - {"change", 1751}, - {"------ Message Queues PIDs --------\n", 1752}, - {"lspid", 1753}, - {"lrpid", 1754}, - {"------ Message Queues --------\n", 1755}, - {"%-10s %-10s %-10s %-10s %-12s %-12s\n", 1756}, - {"used-bytes", 1757}, - {"messages", 1758}, +\t-u : summary\n", 1677}, + {"-i id [-s -q -m] : details on resource identified by id\n", 1678}, + {"kernel not configured for shared memory\n", 1679}, + {"------ Shared Memory Limits --------\n", 1680}, + {"max number of segments = %ld\n", 1681}, + {"max seg size (kbytes) = %ld\n", 1682}, + {"max total shared memory (kbytes) = %ld\n", 1683}, + {"min seg size (bytes) = %ld\n", 1684}, + {"------ Shared Memory Status --------\n", 1685}, + {"segments allocated %d\n", 1686}, + {"pages allocated %ld\n", 1687}, + {"pages resident %ld\n", 1688}, + {"pages swapped %ld\n", 1689}, + {"Swap performance: %ld attempts\t %ld successes\n", 1690}, + {"------ Shared Memory Segment Creators/Owners --------\n", 1691}, + {"%-10s %-10s %-10s %-10s %-10s %-10s\n", 1692}, + {"shmid", 1693}, + {"perms", 1694}, + {"cuid", 1695}, + {"cgid", 1696}, + {"uid", 1697}, + {"gid", 1698}, + {"------ Shared Memory Attach/Detach/Change Times --------\n", 1699}, + {"%-10s %-10s %-20s %-20s %-20s\n", 1700}, + {"owner", 1701}, + {"attached", 1702}, + {"detached", 1703}, + {"changed", 1704}, + {"------ Shared Memory Creator/Last-op --------\n", 1705}, + {"%-10s %-10s %-10s %-10s\n", 1706}, + {"cpid", 1707}, + {"lpid", 1708}, + {"------ Shared Memory Segments --------\n", 1709}, + {"%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n", 1710}, + {"key", 1711}, + {"bytes", 1712}, + {"nattch", 1713}, + {"status", 1714}, + {"Not set", 1715}, + {"dest", 1716}, + {"locked", 1717}, + {"kernel not configured for semaphores\n", 1718}, + {"------ Semaphore Limits --------\n", 1719}, + {"max number of arrays = %d\n", 1720}, + {"max semaphores per array = %d\n", 1721}, + {"max semaphores system wide = %d\n", 1722}, + {"max ops per semop call = %d\n", 1723}, + {"semaphore max value = %d\n", 1724}, + {"------ Semaphore Status --------\n", 1725}, + {"used arrays = %d\n", 1726}, + {"allocated semaphores = %d\n", 1727}, + {"------ Semaphore Arrays Creators/Owners --------\n", 1728}, + {"semid", 1729}, + {"------ Shared Memory Operation/Change Times --------\n", 1730}, + {"%-8s %-10s %-26.24s %-26.24s\n", 1731}, + {"last-op", 1732}, + {"last-changed", 1733}, + {"------ Semaphore Arrays --------\n", 1734}, + {"%-10s %-10s %-10s %-10s %-10s\n", 1735}, + {"nsems", 1736}, + {"kernel not configured for message queues\n", 1737}, + {"------ Messages: Limits --------\n", 1738}, + {"max queues system wide = %d\n", 1739}, + {"max size of message (bytes) = %d\n", 1740}, + {"default max size of queue (bytes) = %d\n", 1741}, + {"------ Messages: Status --------\n", 1742}, + {"allocated queues = %d\n", 1743}, + {"used headers = %d\n", 1744}, + {"used space = %d bytes\n", 1745}, + {"------ Message Queues: Creators/Owners --------\n", 1746}, + {"msqid", 1747}, + {"------ Message Queues Send/Recv/Change Times --------\n", 1748}, + {"%-8s %-10s %-20s %-20s %-20s\n", 1749}, + {"send", 1750}, + {"recv", 1751}, + {"change", 1752}, + {"------ Message Queues PIDs --------\n", 1753}, + {"lspid", 1754}, + {"lrpid", 1755}, + {"------ Message Queues --------\n", 1756}, + {"%-10s %-10s %-10s %-10s %-12s %-12s\n", 1757}, + {"used-bytes", 1758}, + {"messages", 1759}, {"\ \n\ -Shared memory Segment shmid=%d\n", 1759}, - {"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n", 1760}, - {"mode=%#o\taccess_perms=%#o\n", 1761}, - {"bytes=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n", 1762}, - {"att_time=%-26.24s\n", 1763}, - {"det_time=%-26.24s\n", 1764}, - {"change_time=%-26.24s\n", 1765}, +Shared memory Segment shmid=%d\n", 1760}, + {"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n", 1761}, + {"mode=%#o\taccess_perms=%#o\n", 1762}, + {"bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n", 1763}, + {"att_time=%-26.24s\n", 1764}, + {"det_time=%-26.24s\n", 1765}, + {"change_time=%-26.24s\n", 1766}, {"\ \n\ -Message Queue msqid=%d\n", 1766}, - {"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n", 1767}, - {"cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n", 1768}, - {"send_time=%-26.24s\n", 1769}, - {"rcv_time=%-26.24s\n", 1770}, +Message Queue msqid=%d\n", 1767}, + {"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n", 1768}, + {"cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n", 1769}, + {"send_time=%-26.24s\n", 1770}, + {"rcv_time=%-26.24s\n", 1771}, {"\ \n\ -Semaphore Array semid=%d\n", 1771}, - {"uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n", 1772}, - {"mode=%#o, access_perms=%#o\n", 1773}, - {"nsems = %ld\n", 1774}, - {"otime = %-26.24s\n", 1775}, - {"ctime = %-26.24s\n", 1776}, - {"semnum", 1777}, - {"value", 1778}, - {"ncount", 1779}, - {"zcount", 1780}, - {"pid", 1781}, - {"usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]", 1782}, - {"\ - rdev /dev/fd0 (or rdev /linux, etc.) displays the current ROOT device", 1783}, - {" rdev /dev/fd0 /dev/hda2 sets ROOT to /dev/hda2", 1784}, - {" rdev -R /dev/fd0 1 set the ROOTFLAGS (readonly status)", 1785}, - {" rdev -r /dev/fd0 627 set the RAMDISK size", 1786}, - {" rdev -v /dev/fd0 1 set the bootup VIDEOMODE", 1787}, - {" rdev -o N ... use the byte offset N", 1788}, - {" rootflags ... same as rdev -R", 1789}, - {" ramsize ... same as rdev -r", 1790}, - {" vidmode ... same as rdev -v", 1791}, - {"\ -Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,...", 1792}, - {" use -R 1 to mount root readonly, -R 0 for read/write.", 1793}, - {"missing comma", 1794}, +Semaphore Array semid=%d\n", 1772}, + {"uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n", 1773}, + {"mode=%#o, access_perms=%#o\n", 1774}, + {"nsems = %ld\n", 1775}, + {"otime = %-26.24s\n", 1776}, + {"ctime = %-26.24s\n", 1777}, + {"semnum", 1778}, + {"value", 1779}, + {"ncount", 1780}, + {"zcount", 1781}, + {"pid", 1782}, + {"usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]", 1783}, + {"\ + rdev /dev/fd0 (or rdev /linux, etc.) displays the current ROOT device", 1784}, + {" rdev /dev/fd0 /dev/hda2 sets ROOT to /dev/hda2", 1785}, + {" rdev -R /dev/fd0 1 set the ROOTFLAGS (readonly status)", 1786}, + {" rdev -r /dev/fd0 627 set the RAMDISK size", 1787}, + {" rdev -v /dev/fd0 1 set the bootup VIDEOMODE", 1788}, + {" rdev -o N ... use the byte offset N", 1789}, + {" rootflags ... same as rdev -R", 1790}, + {" ramsize ... same as rdev -r", 1791}, + {" vidmode ... same as rdev -v", 1792}, + {"\ +Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,...", 1793}, + {" use -R 1 to mount root readonly, -R 0 for read/write.", 1794}, + {"missing comma", 1795}, {"\ %s: Usage: \"%s [options]\n\ \t -m (default = \"%s\")\n\ @@ -2356,129 +2357,153 @@ Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,...", 1 \t -b print individual histogram-bin counts\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", 1795}, - {"out of memory", 1796}, - {"%s Version %s\n", 1797}, - {"Sampling_step: %i\n", 1798}, - {"%s: %s(%i): wrong map line\n", 1799}, - {"%s: can't find \"_stext\" in %s\n", 1800}, - {"%s: profile address out of range. Wrong map file?\n", 1801}, - {"total", 1802}, - {"\ -usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n", 1803}, - {"renice: %s: unknown user\n", 1804}, - {"renice: %s: bad value\n", 1805}, - {"getpriority", 1806}, - {"setpriority", 1807}, - {"%d: old priority %d, new priority %d\n", 1808}, - {"usage: %s program [arg ...]\n", 1809}, +\t -V print version and exit\n", 1796}, + {"out of memory", 1797}, + {"%s Version %s\n", 1798}, + {"Sampling_step: %i\n", 1799}, + {"%s: %s(%i): wrong map line\n", 1800}, + {"%s: can't find \"_stext\" in %s\n", 1801}, + {"%s: profile address out of range. Wrong map file?\n", 1802}, + {"total", 1803}, + {"\ +usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n", 1804}, + {"renice: %s: unknown user\n", 1805}, + {"renice: %s: bad value\n", 1806}, + {"getpriority", 1807}, + {"setpriority", 1808}, + {"%d: old priority %d, new priority %d\n", 1809}, + {"usage: %s program [arg ...]\n", 1810}, {"\ Usage: %s [ -i | -t