From d162fcb550a77875c8f58fda0e0a0bd91f211c99 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Thu, 7 Dec 2006 00:26:24 +0100 Subject: [PATCH] Imported from util-linux-2.12j tarball. --- HISTORY | 14 + MCONFIG | 7 +- VERSION | 2 +- configure | 3 +- fdisk/cfdisk.c | 10 +- fdisk/fdisk.c | 22 +- fdisk/i386_sys_types.c | 1 + fdisk/sfdisk.c | 5 +- login-utils/Makefile | 3 + login-utils/login.c | 21 +- misc-utils/Makefile | 11 +- misc-utils/cal.c | 432 ++++-- misc-utils/cal_test.sh | 9 + misc-utils/kill.c | 2 +- mount-2.12-fat.patch | 319 ---- mount/fstab.c | 2 +- mount/lomount.c | 126 +- mount/losetup.8 | 52 +- mount/mount.8 | 20 + mount/mount.c | 183 ++- mount/mount_blkid.c | 2 +- mount/mount_by_label.c | 6 +- mount/mount_guess_fstype.c | 2 +- mount/mount_guess_rootdev.c | 2 +- mount/swapon.8 | 4 +- mount/swapon.c | 9 +- mount/umount.8 | 3 + mount/umount.c | 145 +- po/ca.po | 1351 ++++++++--------- po/cat-id-tbl.c | 2800 ++++++++++++++++++----------------- po/cs.po | 1351 ++++++++--------- po/da.po | 1759 +++++++++++----------- po/de.po | 1351 ++++++++--------- po/es.po | 1351 ++++++++--------- po/et.po | 1349 ++++++++--------- po/fi.po | 1351 ++++++++--------- po/fr.po | 1365 ++++++++--------- po/it.po | 1351 ++++++++--------- po/ja.po | 1351 ++++++++--------- po/nl.po | 1351 ++++++++--------- po/pt_BR.po | 1351 ++++++++--------- po/sl.po | 1350 ++++++++--------- po/sv.po | 1351 ++++++++--------- po/tr.po | 1351 ++++++++--------- po/uk.po | 1351 ++++++++--------- sys-utils/Makefile | 4 +- sys-utils/flock.1 | 45 + sys-utils/flock.c | 116 ++ sys-utils/readprofile.c | 4 + text-utils/more.c | 276 +--- 50 files changed, 13581 insertions(+), 13116 deletions(-) create mode 100644 misc-utils/cal_test.sh delete mode 100644 mount-2.12-fat.patch create mode 100644 sys-utils/flock.1 create mode 100644 sys-utils/flock.c diff --git a/HISTORY b/HISTORY index 4ce2b65c..f933515b 100644 --- a/HISTORY +++ b/HISTORY @@ -1,3 +1,17 @@ +util-linux 2.12j + +* cal: highlight today (Pádraig Brady) +* lomount: stop reading passwd at NUL, fix lo_encrypt key_size (Wolfram Kleff) +* losetup: add -f option to find an unused loop device + (Alexander Wigen, Remco van Mook) +* more: code cleanup (Joachim Henke) +* mount: add "group" mount option (Martin Dickopp) +* sfdisk: fix 2.6.8 BLKRRPART ioctl damage (Eric Lammerts) +* swapon: let swapon -a skip the swapfiles marked "noauto" (Dale R. Worley) +* umount: fix problem with empty mtab (Bryan Kadzban) +* umount: use special umount program if it exists (Ram Pai) +* New Danish messages + util-linux 2.12i * MCONFIG: fix build conditions diff --git a/MCONFIG b/MCONFIG index 1e6a6f87..beb40207 100644 --- a/MCONFIG +++ b/MCONFIG @@ -90,6 +90,11 @@ HAVE_KILL=no # file descriptor after logging out to trick the next user. ALLOW_VCS_USE=yes +# If DO_STAT_MAIL is set to "yes", then login will stat() the mailbox +# and tell the user that she has new mail. This can hang the login if +# the mailbox is on a NFS mounted filesystem. +DO_STAT_MAIL=no + # If HAVE_RESET is set to "yes", then reset won't be installed. The version # of reset that comes with the ncurses package is less aggressive. HAVE_RESET=yes @@ -118,7 +123,7 @@ ifeq "$(ARCH)" "intel" CPUHEAD=-m else CPUHEAD=-mcpu=i -# recent versions want -march=i +# it is rumoured that recent gcc versions want -march=i # must add the right test endif ifeq "$(CPU)" "i386" diff --git a/VERSION b/VERSION index b40f0e4a..d32f3099 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.12i +2.12j diff --git a/configure b/configure index f98df560..e91ac837 100755 --- a/configure +++ b/configure @@ -145,7 +145,7 @@ if ./testincl "sys/user.h"; then echo "#define HAVE_sys_user_h" >> defines.h else if ./testincl "asm/page.h"; then echo "#define HAVE_asm_page_h" >> defines.h -fi fi +fi; fi # # H7. For nfsmount.c: do we have ? @@ -418,6 +418,7 @@ if [ $have_ncurses = 0 ]; then echo "You don't have ncurses - I will not make ul and setterm." else echo "LIBCURSES=-lncurses" >> make_include + echo "#define HAVE_ncurses" >> defines.h fi # diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c index 81fa74a8..d4528100 100644 --- a/fdisk/cfdisk.c +++ b/fdisk/cfdisk.c @@ -1444,8 +1444,10 @@ new_part(int i) { print_warning(_("No room to create the extended partition")); return; } - (void) add_part(ext, DOS_EXTENDED, 0, first, last, - (first == 0 ? sectors : 0), 0, &errmsg); + errmsg = 0; + if (add_part(ext, DOS_EXTENDED, 0, first, last, + (first == 0 ? sectors : 0), 0, &errmsg) && errmsg) + print_warning(errmsg); first = ext_info.first_sector + ext_info.offset; } @@ -1456,7 +1458,9 @@ new_part(int i) { if (first == 0 || IS_LOGICAL(num)) offset = sectors; - (void) add_part(num, id, flags, first, last, offset, 0, &errmsg); + errmsg = 0; + if (add_part(num, id, flags, first, last, offset, 0, &errmsg) && errmsg) + print_warning(errmsg); } static void diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c index 40a4967e..b3b61be6 100644 --- a/fdisk/fdisk.c +++ b/fdisk/fdisk.c @@ -295,6 +295,20 @@ set_changed(int i) { ptes[i].changed = 1; } +static int +is_garbage_table(void) { + int i; + + for (i = 0; i < 4; i++) { + struct pte *pe = &ptes[i]; + struct partition *p = pe->part_table; + + if (p->boot_ind != 0 && p->boot_ind != 0x80) + return 1; + } + return 0; +} + /* * Avoid warning about DOS partitions when no DOS partition was changed. * Here a heuristic "is probably dos partition". @@ -630,7 +644,7 @@ read_extended(int ext) { struct pte *pre = &ptes[partitions-1]; fprintf(stderr, - _("Warning: deleting partitions after %d\n"), + _("Warning: omitting partitions after %d\n"), partitions); clear_partition(pre->ext_pointer); pre->changed = 1; @@ -1684,6 +1698,12 @@ list_table(int xtra) { return; } + if (is_garbage_table()) { + printf(_("This doesn't look like a partition table\n" + "Probably you selected the wrong device.\n\n")); + } + + /* Heuristic: we list partition 3 of /dev/foo as /dev/foo3, but if the device name ends in a digit, say /dev/foo1, then the partition is called /dev/foo1p3. */ diff --git a/fdisk/i386_sys_types.c b/fdisk/i386_sys_types.c index 94e50cc7..fb70b085 100644 --- a/fdisk/i386_sys_types.c +++ b/fdisk/i386_sys_types.c @@ -74,6 +74,7 @@ struct systypes i386_sys_types[] = { {0xb8, N_("BSDI swap")}, {0xbb, N_("Boot Wizard hidden")}, {0xbe, N_("Solaris boot")}, + {0xbf, N_("Solaris")}, {0xc1, N_("DRDOS/sec (FAT-12)")}, {0xc4, N_("DRDOS/sec (FAT-16 < 32M)")}, {0xc6, N_("DRDOS/sec (FAT-16)")}, diff --git a/fdisk/sfdisk.c b/fdisk/sfdisk.c index 5c0c8d29..7cebc33b 100644 --- a/fdisk/sfdisk.c +++ b/fdisk/sfdisk.c @@ -792,7 +792,10 @@ static int reread_ioctl(int fd) { if (ioctl(fd, BLKRRPART)) { perror("BLKRRPART"); - return -1; + + /* 2.6.8 returns EIO for a zero table */ + if (errno == EBUSY) + return -1; } return 0; } diff --git a/login-utils/Makefile b/login-utils/Makefile index 6b05a168..e6e6a0d3 100644 --- a/login-utils/Makefile +++ b/login-utils/Makefile @@ -143,6 +143,9 @@ endif ifeq "$(ALLOW_VCS_USE)" "yes" LOGINFLAGS += -DCHOWNVCS endif +ifeq "$(DO_STAT_MAIL)" "yes" + LOGINFLAGS += -DDO_STAT_MAIL +endif login.o: login.c $(LIB)/pathnames.h $(LIB)/setproctitle.c $(LIB)/setproctitle.h $(CC) -c $(CFLAGS) $(PAMFL) $(LOGINFLAGS) login.c diff --git a/login-utils/login.c b/login-utils/login.c index 3b1bfa56..66612124 100644 --- a/login-utils/login.c +++ b/login-utils/login.c @@ -1081,17 +1081,28 @@ Michael Riepe } if (!quietlog) { - struct stat st; - char *mail; - motd(); - mail = getenv("MAIL"); - if (mail && stat(mail, &st) == 0 && st.st_size != 0) { + +#ifdef DO_STAT_MAIL + /* + * This turns out to be a bad idea: when the mail spool + * is NFS mounted, and the NFS connection hangs, the + * login hangs, even root cannot login. + * Checking for mail should be done from the shell. + */ + { + struct stat st; + char *mail; + + mail = getenv("MAIL"); + if (mail && stat(mail, &st) == 0 && st.st_size != 0) { if (st.st_mtime > st.st_atime) printf(_("You have new mail.\n")); else printf(_("You have mail.\n")); + } } +#endif } signal(SIGALRM, SIG_DFL); diff --git a/misc-utils/Makefile b/misc-utils/Makefile index 6fb38c72..cc1d5cd5 100644 --- a/misc-utils/Makefile +++ b/misc-utils/Makefile @@ -51,7 +51,6 @@ LIBPTY:=$(LIBPTY) -lutil endif # Programs requiring special compilation - NEEDS_CURSES= setterm NEEDS_OPENPTY= script @@ -64,6 +63,16 @@ else @echo $@ not made since it requires ncurses endif +ifeq "$(HAVE_NCURSES)" "yes" +cal: + $(CC) $(LDFLAGS) $^ -o $@ $(LIBCURSES) +else +ifeq "$(HAVE_TERMCAP)" "yes" +cal: + $(CC) $(LDFLAGS) $^ -o $@ $(LIBTERMCAP) +endif +endif + $(NEEDS_OPENPTY): $(CC) $(LDFLAGS) $^ -o $@ $(LIBPTY) diff --git a/misc-utils/cal.c b/misc-utils/cal.c index 527b5bbc..83015ea9 100644 --- a/misc-utils/cal.c +++ b/misc-utils/cal.c @@ -35,11 +35,11 @@ */ /* 1999-02-01 Jean-Francois Bignolles: added option '-m' to display - * monday as the first day of the week. + * monday as the first day of the week. * 1999-02-22 Arkadiusz Mi¶kiewicz * - added Native Language Support * - * 2000-09-01 Michael Charles Pruznick + * 2000-09-01 Michael Charles Pruznick * Added "-3" option to print prev/next month with current. * Added over-ridable default NUM_MONTHS and "-1" option to * get traditional output when -3 is the default. I hope that @@ -68,6 +68,57 @@ #include "nls.h" #include "../defines.h" +#if defined(HAVE_ncurses) + +#if NCH +#include +#else +#include +#endif +#include /* include after */ + +static void +my_setupterm(const char *term, int fildes, int *errret) { + setupterm((char*)term, fildes, errret); +} + +static void +my_putstring(char *s) { + putp(s); +} + +static char * +my_tgetstr(char *s, char *ss) { + return tigetstr(ss); +} + +#elif defined(HAVE_termcap) + +#include + +char termbuffer[4096]; +char tcbuffer[4096]; +char *strbuf = termbuffer; + +static void +my_setupterm(const char *term, int fildes, int *errret) { + *errret = tgetent(tcbuffer, term); +} + +static void +my_putstring(char *s) { + tputs (s, 1, putchar); +} + +static char * +my_tgetstr(char *s, char *ss) { + return tgetstr(s, &strbuf); +} + +#endif +const char *term=""; +const char *Senter="", *Sexit="";/* enter and exit standout mode */ + #ifdef HAVE_langinfo_h # include #else @@ -77,7 +128,7 @@ #include "widechar.h" #define SIZE(a) (sizeof(a)/sizeof((a)[0])) - + /* allow compile-time define to over-ride default */ #ifndef NUM_MONTHS #define NUM_MONTHS 1 @@ -88,10 +139,10 @@ #endif #define THURSDAY 4 /* for reformation */ -#define SATURDAY 6 /* 1 Jan 1 was a Saturday */ +#define SATURDAY 6 /* 1 Jan 1 was a Saturday */ -#define FIRST_MISSING_DAY 639799 /* 3 Sep 1752 */ -#define NUMBER_MISSING_DAYS 11 /* 11 day correction */ +#define FIRST_MISSING_DAY 639799 /* 3 Sep 1752 */ +#define NUMBER_MISSING_DAYS 11 /* 11 day correction */ #define MAXDAYS 43 /* max slots in a month array */ #define SPACE -1 /* used in day array */ @@ -162,6 +213,8 @@ const char *full_month[12]; int week1stday=0; int julian; +#define TODAY_FLAG 0x400 /* flag day for highlighting */ + #define FMT_ST_LINES 8 #define FMT_ST_CHARS 300 /* 90 suffices in most locales */ struct fmt_st @@ -169,26 +222,27 @@ struct fmt_st char s[FMT_ST_LINES][FMT_ST_CHARS]; }; -void ascii_day __P((char *, int)); -void center __P((const char *, int, int)); -void day_array __P((int, int, int *)); -int day_in_week __P((int, int, int)); -int day_in_year __P((int, int, int)); -void j_yearly __P((int)); -void do_monthly __P((int, int, struct fmt_st*)); -void monthly __P((int, int)); -void monthly3 __P((int, int)); -void trim_trailing_spaces __P((char *)); -void usage __P((void)); -void yearly __P((int)); -void headers_init(void); +char * ascii_day(char *, int); +void center_str(const char* src, char* dest, size_t dest_size, int width); +void center(const char *, int, int); +void day_array(int, int, int, int *); +int day_in_week(int, int, int); +int day_in_year(int, int, int); +void yearly(int, int); +void j_yearly(int, int); +void do_monthly(int, int, int, struct fmt_st*); +void monthly(int, int, int); +void monthly3(int, int, int); +void trim_trailing_spaces(char *); +void usage(void); +void headers_init(void); extern char *__progname; int main(int argc, char **argv) { struct tm *local_time; time_t now; - int ch, month, year, yflag; + int ch, day, month, year, yflag; char *progname, *p; int num_months = NUM_MONTHS; @@ -201,6 +255,17 @@ main(int argc, char **argv) { bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); +#if defined(HAVE_ncurses) || defined(HAVE_termcap) + if ((term = getenv("TERM"))) { + int ret; + my_setupterm(term, 1, &ret); + if (ret > 0) { + Senter = my_tgetstr("so","smso"); + Sexit = my_tgetstr("se","rmso"); + } + } +#endif + #if 0 /* setting week1stday is against man page */ /* * What *is* the first day of the week? Note that glibc does not @@ -214,7 +279,7 @@ main(int argc, char **argv) { * * The traditional Unix cal utility starts at Sunday. * We start at Sunday and have an option -m for starting at Monday. - * + * * At some future time this may become -s for Sunday, -m for Monday, * no option for glibc-determined locale-dependent version. */ @@ -222,16 +287,16 @@ main(int argc, char **argv) { week1stday = (int)(nl_langinfo(_NL_TIME_FIRST_WEEKDAY))[0]; #endif #endif - + yflag = 0; while ((ch = getopt(argc, argv, "13mjsyV")) != -1) switch(ch) { - case '1': - num_months = 1; /* default */ - break; - case '3': - num_months = 3; - break; + case '1': + num_months = 1; /* default */ + break; + case '3': + num_months = 3; + break; case 's': week1stday = 0; /* default */ break; @@ -255,7 +320,7 @@ main(int argc, char **argv) { argc -= optind; argv += optind; - month = year = 0; + day = month = year = 0; switch(argc) { case 2: if ((month = atoi(*argv++)) < 1 || month > 12) @@ -266,8 +331,10 @@ main(int argc, char **argv) { errx(1, _("illegal year value: use 1-9999")); break; case 0: - (void)time(&now); + time(&now); local_time = localtime(&now); + if (isatty(1)) + day = local_time->tm_yday + 1; year = local_time->tm_year + 1900; if (!yflag) month = local_time->tm_mon + 1; @@ -278,13 +345,13 @@ main(int argc, char **argv) { headers_init(); if (month && num_months == 1) - monthly(month, year); + monthly(day, month, year); else if (month && num_months == 3) - monthly3(month, year); + monthly3(day, month, year); else if (julian) - j_yearly(year); + j_yearly(day, year); else - yearly(year); + yearly(day, year); exit(0); } @@ -316,7 +383,7 @@ void headers_init(void) #else # define weekday(wd) _time_info->abbrev_wkday[wd] #endif - + for(i = 0 ; i < 7 ; i++ ) { wd = (i + week1stday) % 7; #ifdef ENABLE_WIDECHAR @@ -342,8 +409,10 @@ void headers_init(void) wcstombs(j_day_headings,j_day_headings_wc,sizeof(j_day_headings)); #endif + trim_trailing_spaces(day_headings); + trim_trailing_spaces(j_day_headings); #undef weekday - + for (i = 0; i < 12; i++) { #ifdef HAVE_langinfo_h full_month[i] = nl_langinfo(MON_1+i); @@ -354,62 +423,51 @@ void headers_init(void) } void -do_monthly(month, year, out) - int month, year; - struct fmt_st* out; -{ +do_monthly(int day, int month, int year, struct fmt_st *out) { int col, row, len, days[MAXDAYS]; - char *p, lineout[300]; -#ifdef ENABLE_WIDECHAR - wchar_t lineout_wc[300]; -#endif - - day_array(month, year, days); - /* %s is the month name, %d the year number. + char *p, lineout[FMT_ST_CHARS]; + int width = (julian ? J_WEEK_LEN : WEEK_LEN) - 1; + + day_array(day, month, year, days); + + /* + * %s is the month name, %d the year number. * you can change the order and/or add something here; eg for * Basque the translation should be: "%2$dko %1$s", and * the Vietnamese should be "%s na(m %d", etc. */ len = sprintf(lineout, _("%s %d"), full_month[month - 1], year); -#ifdef ENABLE_WIDECHAR - if (mbstowcs(lineout_wc,lineout,len) > 0) { - len = wcswidth(lineout_wc,len); - } else { - len = strlen(lineout); - } -#endif - (void)sprintf(out->s[0],"%*s%s", - ((julian ? J_WEEK_LEN : WEEK_LEN) - len) / 2, "", lineout ); - (void)sprintf(out->s[1],"%s", - julian ? j_day_headings : day_headings); + center_str(lineout, out->s[0], SIZE(out->s[0]), width); + + sprintf(out->s[1],"%s", + julian ? j_day_headings : day_headings); for (row = 0; row < 6; row++) { - for (col = 0, p = lineout; col < 7; col++, - p += julian ? J_DAY_LEN : DAY_LEN) - ascii_day(p, days[row * 7 + col]); + for (col = 0, p = lineout; col < 7; col++) + p = ascii_day(p, days[row * 7 + col]); *p = '\0'; trim_trailing_spaces(lineout); - (void)sprintf(out->s[row+2],"%s", lineout); + sprintf(out->s[row+2], "%s", lineout); } } void -monthly(month, year) - int month, year; -{ +monthly(int day, int month, int year) { int i; struct fmt_st out; - do_monthly(month, year, &out); - for ( i = 0; i < FMT_ST_LINES; i++ ) - { - printf("%s\n", out.s[i]); + do_monthly(day, month, year, &out); + for (i = 0; i < FMT_ST_LINES; i++) { +#if defined(HAVE_ncurses) || defined(HAVE_termcap) + my_putstring(out.s[i]);putchar('\n'); +#else + puts(out.s[i]); +#endif } } void -monthly3(month, year) - int month, year; -{ +monthly3(int day, int month, int year) { + char lineout[FMT_ST_CHARS]; int i; int width; struct fmt_st out_prev; @@ -418,109 +476,117 @@ monthly3(month, year) int prev_month, prev_year; int next_month, next_year; - if ( month == 1 ) - { - prev_month = 12; - prev_year = year - 1; - } - else - { - prev_month = month - 1; - prev_year = year; - } - if ( month == 12 ) - { - next_month = 1; - next_year = year + 1; + if (month == 1) { + prev_month = 12; + prev_year = year - 1; + } else { + prev_month = month - 1; + prev_year = year; } - else - { - next_month = month + 1; - next_year = year; + if (month == 12) { + next_month = 1; + next_year = year + 1; + } else { + next_month = month + 1; + next_year = year; } - do_monthly(prev_month, prev_year, &out_prev); - do_monthly(month, year, &out_curm); - do_monthly(next_month, next_year, &out_next); - width = (julian ? J_WEEK_LEN : WEEK_LEN); - for ( i = 0; i < FMT_ST_LINES; i++ ) - { - printf("%-*.*s %-*.*s %-*.*s\n", - width, width, out_prev.s[i], - width, width, out_curm.s[i], - width, width, out_next.s[i] ); + do_monthly(day, prev_month, prev_year, &out_prev); + do_monthly(day, month, year, &out_curm); + do_monthly(day, next_month, next_year, &out_next); + width = (julian ? J_WEEK_LEN : WEEK_LEN) -1; + for (i = 0; i < 2; i++) + printf("%s %s %s\n", out_prev.s[i], out_curm.s[i], out_next.s[i]); + for (i = 2; i < FMT_ST_LINES; i++) { + snprintf(lineout, SIZE(lineout), "%-*s %-*s %-*s\n", + width, out_prev.s[i], + width, out_curm.s[i], + width, out_next.s[i]); +#if defined(HAVE_ncurses) || defined(HAVE_termcap) + my_putstring(lineout); +#else + fputs(lineout,stdout); +#endif } } void -j_yearly(year) - int year; -{ +j_yearly(int day, int year) { int col, *dp, i, month, row, which_cal; int days[12][MAXDAYS]; char *p, lineout[80]; - (void)sprintf(lineout, "%d", year); + sprintf(lineout, "%d", year); center(lineout, J_WEEK_LEN * 2 + J_HEAD_SEP, 0); - (void)printf("\n\n"); + printf("\n\n"); + for (i = 0; i < 12; i++) - day_array(i + 1, year, days[i]); - (void)memset(lineout, ' ', sizeof(lineout) - 1); + day_array(day, i + 1, year, days[i]); + memset(lineout, ' ', sizeof(lineout) - 1); lineout[sizeof(lineout) - 1] = '\0'; for (month = 0; month < 12; month += 2) { center(full_month[month], J_WEEK_LEN, J_HEAD_SEP); center(full_month[month + 1], J_WEEK_LEN, 0); - (void)printf("\n%s%*s%s\n", j_day_headings, J_HEAD_SEP, "", + printf("\n%s%*s %s\n", j_day_headings, J_HEAD_SEP, "", j_day_headings); for (row = 0; row < 6; row++) { + p = lineout; for (which_cal = 0; which_cal < 2; which_cal++) { - p = lineout + which_cal * (J_WEEK_LEN + 2); dp = &days[month + which_cal][row * 7]; - for (col = 0; col < 7; col++, p += J_DAY_LEN) - ascii_day(p, *dp++); + for (col = 0; col < 7; col++) + p = ascii_day(p, *dp++); + p += sprintf(p, " "); } *p = '\0'; trim_trailing_spaces(lineout); - (void)printf("%s\n", lineout); +#if defined(HAVE_ncurses) || defined(HAVE_termcap) + my_putstring(lineout);putchar('\n'); +#else + puts(lineout); +#endif } } - (void)printf("\n"); + printf("\n"); } void -yearly(year) - int year; -{ +yearly(int day, int year) { int col, *dp, i, month, row, which_cal; int days[12][MAXDAYS]; - char *p, lineout[80]; + char *p, lineout[100]; - (void)sprintf(lineout, "%d", year); + sprintf(lineout, "%d", year); center(lineout, WEEK_LEN * 3 + HEAD_SEP * 2, 0); - (void)printf("\n\n"); + printf("\n\n"); + for (i = 0; i < 12; i++) - day_array(i + 1, year, days[i]); - (void)memset(lineout, ' ', sizeof(lineout) - 1); + day_array(day, i + 1, year, days[i]); + memset(lineout, ' ', sizeof(lineout) - 1); lineout[sizeof(lineout) - 1] = '\0'; for (month = 0; month < 12; month += 3) { center(full_month[month], WEEK_LEN, HEAD_SEP); center(full_month[month + 1], WEEK_LEN, HEAD_SEP); center(full_month[month + 2], WEEK_LEN, 0); - (void)printf("\n%s%*s%s%*s%s\n", day_headings, HEAD_SEP, + printf("\n%s%*s %s%*s %s\n", day_headings, HEAD_SEP, "", day_headings, HEAD_SEP, "", day_headings); for (row = 0; row < 6; row++) { + p = lineout; for (which_cal = 0; which_cal < 3; which_cal++) { - p = lineout + which_cal * (WEEK_LEN + 2); dp = &days[month + which_cal][row * 7]; - for (col = 0; col < 7; col++, p += DAY_LEN) - ascii_day(p, *dp++); + for (col = 0; col < 7; col++) + p = ascii_day(p, *dp++); + p += sprintf(p, " "); } *p = '\0'; trim_trailing_spaces(lineout); - (void)printf("%s\n", lineout); +#if defined(HAVE_ncurses) || defined(HAVE_termcap) + my_putstring(lineout);putchar('\n'); +#else + puts(lineout); +#endif } } - (void)printf("\n"); + printf("\n"); } /* @@ -531,11 +597,8 @@ yearly(year) * builds that array for any month from Jan. 1 through Dec. 9999. */ void -day_array(month, year, days) - int month, year; - int *days; -{ - int day, dw, dm; +day_array(int day, int month, int year, int *days) { + int julday, daynum, dw, dm; int *d_sep1752; if (month == 9 && year == 1752) { @@ -546,9 +609,14 @@ day_array(month, year, days) memcpy(days, empty, MAXDAYS * sizeof(int)); dm = days_in_month[leap_year(year)][month]; dw = (day_in_week(1, month, year) - week1stday + 7) % 7; - day = julian ? day_in_year(1, month, year) : 1; - while (dm--) - days[dw++] = day++; + julday = day_in_year(1, month, year); + daynum = julian ? julday : 1; + while (dm--) { + days[dw] = daynum++; + if (julday++ == day) + days[dw] |= TODAY_FLAG; + dw++; + } } /* @@ -556,15 +624,13 @@ day_array(month, year, days) * return the 1 based day number within the year */ int -day_in_year(day, month, year) - int day, month, year; -{ +day_in_year(int day, int month, int year) { int i, leap; leap = leap_year(year); for (i = 1; i < month; i++) day += days_in_month[leap][i]; - return (day); + return day; } /* @@ -575,9 +641,7 @@ day_in_year(day, month, year) * missing days. */ int -day_in_week(day, month, year) - int day, month, year; -{ +day_in_week(int day, int month, int year) { long temp; temp = (long)(year - 1) * 365 + leap_years_since_year_1(year - 1) @@ -589,12 +653,10 @@ day_in_week(day, month, year) return (THURSDAY); } -void -ascii_day(p, day) - char *p; - int day; -{ +char * +ascii_day(char *p, int day) { int display, val; + int highlight = 0; static char *aday[] = { "", " 1", " 2", " 3", " 4", " 5", " 6", " 7", @@ -605,8 +667,14 @@ ascii_day(p, day) }; if (day == SPACE) { - memset(p, ' ', julian ? J_DAY_LEN : DAY_LEN); - return; + int len = julian ? J_DAY_LEN : DAY_LEN; + memset(p, ' ', len); + return p+len; + } + if (day & TODAY_FLAG) { + day &= ~TODAY_FLAG; + p += sprintf(p, Senter); + highlight = 1; } if (julian) { if ((val = day / 100)) { @@ -627,7 +695,10 @@ ascii_day(p, day) *p++ = aday[day][0]; *p++ = aday[day][1]; } - *p = ' '; + if (highlight) + p += sprintf(p, Sexit); + *p++ = ' '; + return p; } void @@ -645,26 +716,59 @@ trim_trailing_spaces(s) *p = '\0'; } +/* + * Center string, handling multibyte characters appropriately. + * In addition if the string is too large for the width it's truncated. + */ +void +center_str(const char* src, char* dest, size_t dest_size, int width) +{ +#ifdef ENABLE_WIDECHAR + wchar_t str_wc[FMT_ST_CHARS]; +#endif + char str[FMT_ST_CHARS]; + const char* str_to_print=src; + int len, spaces, wide_char_enabled=0; + + len = strlen(src); + +#ifdef ENABLE_WIDECHAR + if (mbstowcs(str_wc, src, FMT_ST_CHARS) > 0) { + wide_char_enabled = 1; + len = wcswidth(str_wc, SIZE(str_wc)); + } +#endif + if (len > width) { + str_to_print=str; + if (wide_char_enabled) { +#ifdef ENABLE_WIDECHAR + str_wc[width]=L'\0'; + wcstombs(str, str_wc, SIZE(str)); +#endif + } else { + strncpy(str, src, SIZE(str)); + str[width]='\0'; + } + } + + spaces = width - len; + spaces = ( spaces < 0 ? 0 : spaces ); + + snprintf(dest, dest_size, "%*s%s%*s", + spaces / 2, "", + str_to_print, + spaces / 2 + spaces % 2, "" ); +} + void center(str, len, separate) const char *str; int len; int separate; { -#ifdef ENABLE_WIDECHAR - wchar_t str_wc[300]; - int str_len; - - if (mbstowcs(str_wc,str,300) > 0) { - str_len = wcswidth(str_wc,300); - } else { - str_len = strlen(str); - } - len -= str_len; -#else - len -= strlen(str); -#endif - (void)printf("%*s%s%*s", len / 2, "", str, len / 2 + len % 2, ""); + char lineout[FMT_ST_CHARS]; + center_str(str, lineout, SIZE(lineout), len); + fputs(lineout, stdout); if (separate) (void)printf("%*s", separate, ""); } diff --git a/misc-utils/cal_test.sh b/misc-utils/cal_test.sh new file mode 100644 index 00000000..1bc04f1a --- /dev/null +++ b/misc-utils/cal_test.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +LANG=ga_IE.utf8 ./cal -3 11 2004 #truncation +LANG=zh_HK.utf8 ./cal -3 #centering +./cal | cat #no highlight +TERM= ./cal #no highlight +TERM=vt100 ./cal #highlight with characters to be stripped by putp +./cal -y | head -10 | tr ' ' . #3 spaces +./cal -3 | tr ' ' . #2 spaces ? diff --git a/misc-utils/kill.c b/misc-utils/kill.c index 4d993e4d..46c2f66a 100644 --- a/misc-utils/kill.c +++ b/misc-utils/kill.c @@ -46,7 +46,7 @@ #include #include #include -#include +#include /* for isdigit() */ #include #include #include "kill.h" diff --git a/mount-2.12-fat.patch b/mount-2.12-fat.patch deleted file mode 100644 index 0099bbf0..00000000 --- a/mount-2.12-fat.patch +++ /dev/null @@ -1,319 +0,0 @@ -diff -uNr util-linux-2.12/mount/get_label_uuid.c ../patch/util-linux-2.12/mount/get_label_uuid.c ---- util-linux-2.12/mount/get_label_uuid.c 2002-11-26 12:18:01.000000000 +0100 -+++ ../patch/util-linux-2.12/mount/get_label_uuid.c 2003-10-20 18:27:56.000000000 +0200 -@@ -43,7 +43,139 @@ - #endif - } - --/* for now, only ext2, ext3, xfs, ocfs are supported */ -+/* Remove trailing spaces */ -+static void remtrailspc(char *label) { -+ char *c; -+ -+ c = strchr(label, 0)-1; -+ while (c >= label && *c == ' ') -+ *(c--) = 0; -+} -+ -+static int handle_fat_dirent(struct fat_dirent *dirent, char **label) { -+ size_t namesize; -+ -+ /* end-of-directory marker */ -+ if (!dirent->s_filename[0]) -+ return -1; -+ -+ /* valid volume label */ -+ if ((dirent->s_attr == 0x08 || dirent->s_attr == 0x28) && dirent->s_filename[0] != 0xe5) { -+ -+ /* sanity check */ -+ if (dirent->s_size[0] || dirent->s_size[1] || dirent->s_size[2] || dirent->s_size[3] || -+ dirent->s_cluster[0] || dirent->s_cluster[1]) -+ return -1; -+ -+ namesize = sizeof(dirent->s_filename); -+ if (!(*label = calloc(namesize + 1, 1))) -+ return -1; -+ memcpy(*label, dirent->s_filename, namesize); -+ (*label)[namesize] = 0; -+ remtrailspc(*label); -+ -+ return 0; -+ } -+ -+ return 1; -+} -+ -+static int read_volume_label_fat(int fd, struct fat_super_block *fatsb, char **label) { -+ unsigned i, m; -+ off_t o; -+ -+ m = assemble2le(fatsb->s_dirents); /* root directory entries */ -+ -+ o = (off_t) assemble2le(fatsb->s_ssec) * /* bytes per sector */ -+ ((off_t) assemble2le(fatsb->s_rsecs) + /* reserved sectors */ -+ (off_t) assemble2le(fatsb->s_spfat) * /* sectors per fat */ -+ (off_t) fatsb->s_nfats); /* number of fats */ -+ -+ for (i = 0; i < m; i++) { -+ struct fat_dirent dirent; -+ int rv; -+ -+ if (lseek(fd, o, SEEK_SET) != o || -+ read(fd, &dirent, sizeof(dirent)) != sizeof(dirent)) -+ return -1; -+ -+ if ((rv = handle_fat_dirent(&dirent, label)) != 1) -+ return rv; -+ -+ o += sizeof(dirent); -+ } -+ -+ return -1; -+} -+ -+static int read_volume_label_fat32(int fd, struct fat32_super_block *fat32sb, char **label) { -+ unsigned c; -+ off_t fo, b, o; -+ int i, ifat; -+ size_t m, cs; -+ -+ ifat = fat32sb->s_mirror[0] & 128 ? (fat32sb->s_mirror[0] & 0xF) : 0; -+ -+ if (ifat >= fat32sb->s_nfats) -+ return -1; -+ -+ fo = (off_t) assemble2le(fat32sb->s_ssec) * /* bytes per sector */ -+ ((off_t) assemble2le(fat32sb->s_rsecs) + /* reserved sectors */ -+ (off_t) assemble4le(fat32sb->s_spfat) * /* sectors per fat */ -+ (off_t) ifat); /* number of FAT used */ -+ -+ b = (off_t) assemble2le(fat32sb->s_ssec) * /* bytes per sector */ -+ ((off_t) assemble2le(fat32sb->s_rsecs) + /* reserved sectors */ -+ (off_t) assemble4le(fat32sb->s_spfat) * /* sectors per fat */ -+ (off_t) fat32sb->s_nfats); /* number of FATs */ -+ -+ c = assemble4le(fat32sb->s_rcluster) & 0x0fffffffL; -+ if (c < 2 || c >= 0x0ffffff0) -+ return -1; -+ -+ m = cs = assemble2le(fat32sb->s_ssec) * (size_t) fat32sb->s_scluster; -+ o = b + (off_t) cs*(c-2); -+ -+ for (i = 0; i < 0xFFFF; i++) { /* safety against DoS attack */ -+ struct fat_dirent dirent; -+ int rv; -+ -+ if (lseek(fd, o, SEEK_SET) != o || -+ read(fd, &dirent, sizeof(dirent)) != sizeof(dirent)) -+ return -1; -+ -+ if ((rv = handle_fat_dirent(&dirent, label)) != 1) -+ return rv; -+ -+ if (m > sizeof(dirent)) { -+ m -= sizeof(dirent); -+ o += sizeof(dirent); -+ } else { -+ off_t d; -+ -+ /* next cluster */ -+ -+ d = fo+4*c; -+ if (lseek(fd, d, SEEK_SET) != d || -+ read(fd, &c, 4) != 4) -+ return -1; -+ -+ c = assemble4le((char*) &c) & 0x0fffffffL; -+ if (c < 2 || c >= 0x0ffffff0) { -+ return -1; -+ } -+ -+ m = cs; -+ o = b + cs*(c-2); -+ } -+ } -+ -+ -+ return -1; -+} -+ -+ -+/* for now, only ext2, ext3, xfs, ocfs, fat, fat32 are supported */ - int - get_label_uuid(const char *device, char **label, char *uuid) { - int fd; -@@ -54,8 +186,10 @@ - struct jfs_super_block jfssb; - struct ocfs_volume_header ovh; /* Oracle */ - struct ocfs_volume_label olbl; -+ struct fat_super_block fatsb; -+ struct fat32_super_block fat32sb; - -- fd = open(device, O_RDONLY); -+ fd = open(device, O_RDONLY); - if (fd < 0) - return rv; - -@@ -111,7 +245,87 @@ - memcpy(*label, jfssb.s_label, namesize); - } - rv = 0; -- } -+ } else if (lseek(fd, 0, SEEK_SET) == 0 -+ && read(fd, (char*) &fat32sb, sizeof(fat32sb)) == sizeof(fat32sb) -+ && fat32sb.s_sig[0] == 0x55 -+ && fat32sb.s_sig[1] == 0xAA -+ && (fat32sb.s_media & 0xF0) == 0xF0 -+ && (fat32sb.s_spfat_old[0] == 0) -+ && (fat32sb.s_spfat_old[1] == 0) -+ && fat32sb.s_extsig == 0x29 -+ && (memcmp(fat32sb.s_fs, "FAT32 ", 8) == 0)) { -+ -+ *label = NULL; -+ -+ /* If no root directory entry volume name was found use the one from the boot sector */ -+ if (read_volume_label_fat32(fd, &fat32sb, label) != 0) { -+ if (memcmp(fat32sb.s_label, "NO NAME ", 11) != 0 && -+ memcmp(fat32sb.s_label, " ", 11) != 0 && -+ memcmp(fat32sb.s_label, "\0\0\0\0\0\0\0\0", 8) != 0) { -+ -+ namesize = sizeof(fat32sb.s_label); -+ if ((*label = calloc(namesize + 1, 1)) != NULL) { -+ memcpy(*label, fat32sb.s_label, namesize); -+ (*label)[namesize] = 0; -+ remtrailspc(*label); -+ } -+ } -+ } -+ -+ if (*label) { -+ -+ /* Set UUID from serial */ -+ uuid[0] = fat32sb.s_serial[3]; -+ uuid[1] = fat32sb.s_serial[2]; -+ uuid[2] = fat32sb.s_serial[1]; -+ uuid[3] = fat32sb.s_serial[0]; -+ memset(uuid+4, 0, 12); -+ -+ rv = 0; -+ } -+ } else if (lseek(fd, 0, SEEK_SET) == 0 -+ && read(fd, (char*) &fatsb, sizeof(fatsb)) == sizeof(fatsb) -+ && fatsb.s_sig[0] == 0x55 -+ && fatsb.s_sig[1] == 0xAA -+ && (fatsb.s_media & 0xF0) == 0xF0 -+ && fatsb.s_extsig == 0x29 -+ && (memcmp(fatsb.s_fs, "FAT12 ", 8) == 0 -+ || memcmp(fatsb.s_fs, "FAT16 ", 8) == 0 -+ || memcmp(fatsb.s_fs, "FAT ", 8) == 0 -+ || memcmp(fatsb.s_fs, "\0\0\0\0\0\0\0\0", 8) == 0) -+ && memcmp(fatsb.s_fs2, "FAT32 ", 8) != 0) { -+ -+ *label = NULL; -+ -+ if (read_volume_label_fat(fd, &fatsb, label) != 0) { -+ -+ /* If no root directory entry volume name was found use the one from the boot sector */ -+ if (memcmp(fatsb.s_label, "NO NAME ", 11) != 0 && -+ memcmp(fatsb.s_label, " ", 11) != 0 && -+ memcmp(fatsb.s_label, "\0\0\0\0\0\0\0\0", 8) != 0) { -+ -+ namesize = sizeof(fatsb.s_label); -+ if ((*label = calloc(namesize + 1, 1)) != NULL) { -+ memcpy(*label, fatsb.s_label, namesize); -+ (*label)[namesize] = 0; -+ remtrailspc(*label); -+ } -+ -+ } -+ } -+ -+ if (*label) { -+ -+ /* Set UUID from serial */ -+ uuid[0] = fatsb.s_serial[3]; -+ uuid[1] = fatsb.s_serial[2]; -+ uuid[2] = fatsb.s_serial[1]; -+ uuid[3] = fatsb.s_serial[0]; -+ memset(uuid+4, 0, 12); -+ -+ rv = 0; -+ } -+ } - - close(fd); - return rv; -diff -uNr util-linux-2.12/mount/linux_fs.h ../patch/util-linux-2.12/mount/linux_fs.h ---- util-linux-2.12/mount/linux_fs.h 2003-07-05 22:16:32.000000000 +0200 -+++ ../patch/util-linux-2.12/mount/linux_fs.h 2003-10-20 18:07:06.000000000 +0200 -@@ -122,13 +122,65 @@ - u_char s_dummy[3]; - u_char s_os[8]; /* "MSDOS5.0" or "MSWIN4.0" or "MSWIN4.1" */ - /* mtools-3.9.4 writes "MTOOL394" */ -- u_char s_dummy2[32]; -+ u_char s_ssec[2]; /* bytes per sector */ -+ u_char s_scluster; /* sectors per cluster */ -+ u_char s_rsecs[2]; /* reserved sectors */ -+ u_char s_nfats; /* number of FATs */ -+ u_char s_dirents[2]; /* maximum root directory entries */ -+ u_char s_nsecs[2]; /* total number of sectors */ -+ u_char s_media; /* media type, upper nibble is 0xF */ -+ u_char s_spfat[2]; /* sectors per fat */ -+ -+ u_char s_dummy2[14]; -+ u_char s_extsig; /* extended signature */ -+ u_char s_serial[4]; /* serial number */ - u_char s_label[11]; /* for DOS? */ -- u_char s_fs[8]; /* "FAT12 " or "FAT16 " or all zero */ -+ u_char s_fs[8]; /* "FAT12 " or "FAT16 " or all zero */ - /* OS/2 BM has "FAT " here. */ -- u_char s_dummy3[9]; -- u_char s_label2[11]; /* for Windows? */ -- u_char s_fs2[8]; /* garbage or "FAT32 " */ -+ -+ u_char s_dummy3[20]; -+ u_char s_fs2[8]; /* "FAT32 " */ -+ -+ u_char s_dummy4[420]; -+ u_char s_sig[2]; /* 55 AA */ -+}; -+ -+struct fat32_super_block { -+ u_char s_dummy[3]; -+ u_char s_os[8]; /* "MSDOS5.0" or "MSWIN4.0" or "MSWIN4.1" */ -+ /* mtools-3.9.4 writes "MTOOL394" */ -+ -+ u_char s_ssec[2]; /* bytes per sector */ -+ u_char s_scluster; /* sectors per cluster */ -+ u_char s_rsecs[2]; /* reserved sectors */ -+ u_char s_nfats; /* number of FATs */ -+ u_char s_dirents[2]; /* maximum root directory entries */ -+ u_char s_nsecs[2]; /* total number of sectors */ -+ u_char s_media; /* media type, upper nibble is 0xF */ -+ u_char s_spfat_old[2]; /* sectors per fat */ -+ -+ u_char s_dummy2[12]; -+ u_char s_spfat[4]; /* sectors per FAT */ -+ u_char s_mirror[2]; /* mirror flag */ -+ u_char s_version[2]; /* fs version */ -+ u_char s_rcluster[4]; /* root directory cluster */ -+ -+ u_char s_dummy3[18]; -+ u_char s_extsig; /* extended signature 0x29 */ -+ u_char s_serial[4]; /* serial number */ -+ u_char s_label[11]; /* label */ -+ u_char s_fs[8]; /* filesystem type "FAT32 " */ -+ -+ u_char s_dummy4[420]; -+ u_char s_sig[2]; /* 55 AA */ -+}; -+ -+struct fat_dirent { -+ u_char s_filename[11]; /* Filename with extension */ -+ u_char s_attr; /* File attribute flags */ -+ u_char s_dummy[14]; -+ u_char s_cluster[2]; /* Starting cluster */ -+ u_char s_size[4]; /* File size */ - }; - - #define XFS_SUPER_MAGIC "XFSB" diff --git a/mount/fstab.c b/mount/fstab.c index b1343f32..09b5f584 100644 --- a/mount/fstab.c +++ b/mount/fstab.c @@ -105,7 +105,7 @@ static void discard_mntentchn(struct mntentchn *mc0) { struct mntentchn *mc, *mc1; - for (mc = mc0->nxt; mc != mc0; mc = mc1) { + for (mc = mc0->nxt; mc && mc != mc0; mc = mc1) { mc1 = mc->nxt; my_free(mc->m.mnt_fsname); my_free(mc->m.mnt_dir); diff --git a/mount/lomount.c b/mount/lomount.c index ea8d4a4a..b7ac356e 100644 --- a/mount/lomount.c +++ b/mount/lomount.c @@ -1,17 +1,4 @@ -/* Taken from Ted's losetup.c - Mitch */ -/* Added vfs mount options - aeb - 960223 */ -/* Removed lomount - aeb - 960224 */ - -/* - * 1999-02-22 Arkadiusz Mi¶kiewicz - * - added Native Language Support - * 1999-03-21 Arnaldo Carvalho de Melo - * - fixed strerr(errno) in gettext calls - * 2000-09-24 Marc Mutz - * - added -p option to pass passphrases via fd's to losetup/mount. - * Used for encryption in non-interactive environments. - * The idea behind xgetpass() is stolen from GnuPG, v.1.0.3. - */ +/* Originally from Ted's losetup.c */ #define LOOPMAJOR 7 @@ -37,6 +24,7 @@ #include "nls.h" extern int verbose; +extern char *progname; extern char *xstrdup (const char *s); /* not: #include "sundries.h" */ extern void error (const char *fmt, ...); /* idem */ @@ -186,15 +174,15 @@ find_unused_loop_device (void) { } if (!somedev) - error(_("mount: could not find any device /dev/loop#")); - else if (!someloop) { + error(_("%s: could not find any device /dev/loop#"), progname); + else if (!someloop) error(_( - "mount: Could not find any loop device. Maybe this kernel " + "%s: Could not find any loop device. Maybe this kernel " "does not know\n" " about the loop device? (If so, recompile or " - "`modprobe loop'.)")); - } else - error(_("mount: could not find any free loop device")); + "`modprobe loop'.)"), progname); + else + error(_("%s: could not find any free loop device"), progname); return 0; } @@ -226,15 +214,16 @@ xgetpass(int pfd, const char *prompt) { break; } } - if (read(pfd, pass+i, 1) != 1 || pass[i] == '\n') + if (read(pfd, pass+i, 1) != 1 || + pass[i] == '\n' || pass[i] == 0) break; } + if (pass == NULL) return ""; - else { - pass[i] = 0; - return pass; - } + + pass[i] = 0; + return pass; } static int @@ -249,7 +238,7 @@ int set_loop(const char *device, const char *file, unsigned long long offset, const char *encryption, int pfd, int *loopro) { struct loop_info64 loopinfo64; - int fd, ffd, mode, i; + int fd, ffd, mode, i, n; char *pass; mode = (*loopro ? O_RDONLY : O_RDWR); @@ -302,16 +291,15 @@ set_loop(const char *device, const char *file, unsigned long long offset, break; case LO_CRYPT_XOR: pass = getpass(_("Password: ")); - xstrncpy(loopinfo64.lo_encrypt_key, pass, LO_KEY_SIZE); - memset(pass, 0, strlen(pass)); - loopinfo64.lo_encrypt_key_size = - strlen(loopinfo64.lo_encrypt_key); - break; + goto gotpass; default: pass = xgetpass(pfd, _("Password: ")); + gotpass: xstrncpy(loopinfo64.lo_encrypt_key, pass, LO_KEY_SIZE); - memset(pass, 0, strlen(pass)); - loopinfo64.lo_encrypt_key_size = LO_KEY_SIZE; + n = strlen(pass); + memset(pass, 0, n); + loopinfo64.lo_encrypt_key_size = + (n < LO_KEY_SIZE) ? n : LO_KEY_SIZE; } if (ioctl(fd, LOOP_SET_FD, ffd) < 0) { @@ -413,10 +401,11 @@ static char *progname; static void usage(void) { fprintf(stderr, _("usage:\n\ - %s loop_device # give info\n\ - %s -d loop_device # delete\n\ - %s [ -e encryption ] [ -o offset ] loop_device file # setup\n"), - progname, progname, progname); + %s loop_device # give info\n\ + %s -d loop_device # delete\n\ + %s -f # find unused\n\ + %s [-e encryption] [-o offset] {-f|loop_device} file # setup\n"), + progname, progname, progname, progname); exit(1); } @@ -449,8 +438,8 @@ error (const char *fmt, ...) { int main(int argc, char **argv) { - char *offset, *encryption, *passfd; - int delete, c; + char *p, *offset, *encryption, *passfd, *device, *file; + int delete, find, c; int res = 0; int ro = 0; int pfd = -1; @@ -460,10 +449,15 @@ main(int argc, char **argv) { bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); - delete = off = 0; + delete = find = 0; + off = 0; offset = encryption = passfd = NULL; + progname = argv[0]; - while ((c = getopt(argc,argv,"de:E:o:p:v")) != -1) { + if ((p = strrchr(progname, '/')) != NULL) + progname = p+1; + + while ((c = getopt(argc, argv, "de:E:fo:p:v")) != -1) { switch (c) { case 'd': delete = 1; @@ -472,6 +466,9 @@ main(int argc, char **argv) { case 'e': encryption = optarg; break; + case 'f': + find = 1; + break; case 'o': offset = optarg; break; @@ -485,22 +482,49 @@ main(int argc, char **argv) { usage(); } } - if (argc == 1) usage(); - if ((delete && (argc != optind+1 || encryption || offset)) || - (!delete && (argc < optind+1 || argc > optind+2))) + + if (argc == 1) { usage(); - if (argc == optind+1) { - if (delete) - res = del_loop(argv[optind]); - else - res = show_loop(argv[optind]); + } else if (delete) { + if (argc != optind+1 || encryption || offset || find) + usage(); + } else if (find) { + if (argc < optind || argc > optind+1) + usage(); + } else { + if (argc < optind+1 || argc > optind+2) + usage(); + } + + if (find) { + device = find_unused_loop_device(); + if (device == NULL) + return -1; + if (verbose) + printf("Loop device is %s\n", device); + if (argc == optind) { + printf("%s\n", device); + return 0; + } + file = argv[optind]; } else { + device = argv[optind]; + if (argc == optind+1) + file = NULL; + else + file = argv[optind+1]; + } + + if (delete) + res = del_loop(device); + else if (file == NULL) + res = show_loop(device); + else { if (offset && sscanf(offset, "%llu", &off) != 1) usage(); if (passfd && sscanf(passfd, "%d", &pfd) != 1) usage(); - res = set_loop(argv[optind], argv[optind+1], off, - encryption, pfd, &ro); + res = set_loop(device, file, off, encryption, pfd, &ro); } return res; } diff --git a/mount/losetup.8 b/mount/losetup.8 index 9a42d70a..06022ef4 100644 --- a/mount/losetup.8 +++ b/mount/losetup.8 @@ -3,24 +3,40 @@ losetup \- set up and control loop devices .SH SYNOPSIS .ad l +Get info: +.sp +.in +5 .B losetup -[ -.RB [ \-e | \-E ] -.I encryption -] [ -.B \-o -.I offset -] [ -.B \-p -.I pfd -] -.I loop_device file -.br -.B losetup -[ -.B \-d -] .I loop_device +.sp +.in -5 +Delete loop: +.sp +.in +5 +.B "losetup \-d" +.I loop_device +.sp +.in -5 +Print name of first unused loop device: +.sp +.in +5 +.B "losetup \-f" +.sp +.in -5 +Setup loop device: +.sp +.in +5 +.B losetup +.RB [{\-e | \-E} +.IR encryption ] +.RB [ \-o +.IR offset ] +.RB [ \-p +.IR pfd ] +.in +8 +.RB { \-f | \fIloop_device\fP } +.I file +.in -13 .ad b .SH DESCRIPTION .B losetup @@ -56,6 +72,10 @@ Detach the file or device associated with the specified loop device. Enable data encryption with specified number. .IP "\fB\-e \fIencryption_name\fP" Enable data encryption with specified name. +.IP "\fB\-f\fP" +Find the first unused loop device. If a +.I file +argument is present, use this device. Otherwise, print its name. .IP "\fB\-o \fIoffset\fP" The data start is moved \fIoffset\fP bytes into the specified file or device. diff --git a/mount/mount.8 b/mount/mount.8 index a4b6a51a..f6bf2b43 100644 --- a/mount/mount.8 +++ b/mount/mount.8 @@ -216,6 +216,10 @@ option, with the restriction that the user must be the owner of the special file. This may be useful e.g. for .I /dev/fd if a login script makes the console user owner of this device. +The +.B group +option is similar, with the restriction that the user must be +member of the group of the special file. The programs .B mount @@ -551,6 +555,14 @@ Interpret character or block special devices on the file system. .B exec Permit execution of binaries. .TP +.B group +Allow an ordinary (i.e., non-root) user to mount the file system if one +of his groups matches the group of the device. +This option implies the options +.BR nosuid " and " nodev +(unless overridden by subsequent options, as in the option line +.BR group,dev,suid ). +.TP .B _netdev The filesystem resides on a device that requires network access (used to prevent the system from attempting to mount these filesystems @@ -583,6 +595,14 @@ suidperl(1) installed.) Forbid an ordinary (i.e., non-root) user to mount the file system. This is the default. .TP +.B owner +Allow an ordinary (i.e., non-root) user to mount the file system if he +is the owner of the device. +This option implies the options +.BR nosuid " and " nodev +(unless overridden by subsequent options, as in the option line +.BR owner,dev,suid ). +.TP .B remount Attempt to remount an already-mounted file system. This is commonly used to change the mount flags for a file system, especially to make a diff --git a/mount/mount.c b/mount/mount.c index a9ee637d..f598e8f8 100644 --- a/mount/mount.c +++ b/mount/mount.c @@ -96,6 +96,7 @@ struct opt_map { #define MS_USERS 0x40000000 #define MS_USER 0x20000000 #define MS_OWNER 0x10000000 +#define MS_GROUP 0x08000000 #define MS_COMMENT 0x00020000 #define MS_LOOP 0x00010000 @@ -135,6 +136,8 @@ static const struct opt_map opt_map[] = { { "nouser", 0, 1, MS_USER }, /* Forbid ordinary user to mount */ { "owner", 0, 0, MS_OWNER }, /* Let the owner of the device mount */ { "noowner", 0, 1, MS_OWNER }, /* Device owner has no special privs */ + { "group", 0, 0, MS_GROUP }, /* Let the group of the device mount */ + { "nogroup", 0, 1, MS_GROUP }, /* Device group has no special privs */ { "_netdev", 0, 0, MS_COMMENT}, /* Device requires network */ { "comment", 0, 0, MS_COMMENT}, /* fstab comment only (kudzu,_netdev)*/ @@ -263,7 +266,8 @@ parse_opt (const char *opt, int *mask, char *extra_opts) { if ((om->mask == MS_USER || om->mask == MS_USERS) && !om->inv) *mask |= MS_SECURE; - if ((om->mask == MS_OWNER) && !om->inv) + if ((om->mask == MS_OWNER || om->mask == MS_GROUP) + && !om->inv) *mask |= MS_OWNERSECURE; #ifdef MS_SILENT if (om->mask == MS_SILENT && om->inv) { @@ -507,20 +511,47 @@ guess_fstype_and_mount(const char *spec, const char *node, const char **types, static void suid_check(const char *spec, const char *node, int *flags, char **user) { if (suid) { - /* RedHat patch: allow owners to mount when fstab contains - the owner option. Note that this should never be used - in a high security environment, but may be useful to give - people at the console the possibility of mounting a floppy. */ - if (*flags & MS_OWNER) { - if (!strncmp(spec, "/dev/", 5)) { - struct stat sb; - - if (!stat(spec, &sb)) { + /* + * MS_OWNER: Allow owners to mount when fstab contains + * the owner option. Note that this should never be used + * in a high security environment, but may be useful to give + * people at the console the possibility of mounting a floppy. + * MS_GROUP: Allow members of device group to mount. (Martin Dickopp) + */ + if (*flags & (MS_OWNER | MS_GROUP)) { + struct stat sb; + + if (!strncmp(spec, "/dev/", 5) && stat(spec, &sb) == 0) { + + if (*flags & MS_OWNER) { if (getuid() == sb.st_uid) *flags |= MS_USER; } + + if (*flags & MS_GROUP) { + if (getgid() == sb.st_gid) + *flags |= MS_USER; + else { + int n = getgroups(0, NULL); + + if (n > 0) { + gid_t *groups = xmalloc(n * sizeof(*groups)); + if (getgroups(n, groups) == n) { + int i; + for (i = 0; i < n; i++) { + if (groups[i] == sb.st_gid) { + *flags |= MS_USER; + break; + } + } + } + free(groups); + } + } + } } } + /* James Kehl came with a similar patch: allow an arbitrary user to mount when he is the owner of the mount-point and has write-access to the device. @@ -537,8 +568,7 @@ suid_check(const char *spec, const char *node, int *flags, char **user) { *user = getusername(); } - if (*flags & MS_OWNER) - *flags &= ~MS_OWNER; + *flags &= ~(MS_OWNER | MS_GROUP); } static int @@ -927,13 +957,13 @@ retry_nfs: error (_("mount: %s not mounted already, or bad option"), node); } else { error (_("mount: wrong fs type, bad option, bad superblock on %s,\n" - " or too many mounted file systems"), + " missing codepage, or too many mounted file systems"), spec); if (stat(spec, &statbuf) == 0 && S_ISBLK(statbuf.st_mode) && (fd = open(spec, O_RDONLY | O_NONBLOCK)) >= 0) { if (ioctl(fd, BLKGETSIZE, &size) == 0) { - if (size == 0) { + if (size == 0 && !loop) { warned++; error (" (could this be the IDE device where you in fact use\n" " ide-scsi so that sr0 or sda or so is needed?)"); @@ -1111,61 +1141,63 @@ is_existing_file (const char *s) { static int mount_one (const char *spec, const char *node, const char *types, const char *opts, char *cmdlineopts, int freq, int pass) { - int status, status2; - const char *nspec; - - /* Substitute values in opts, if required */ - opts = usersubst(opts); - - /* Merge the fstab and command line options. */ - if (opts == NULL) - opts = cmdlineopts; - else if (cmdlineopts != NULL) - opts = xstrconcat3(opts, ",", cmdlineopts); - - /* Handle possible LABEL= and UUID= forms of spec */ - nspec = mount_get_devname_for_mounting(spec); - if (nspec) - spec = nspec; - - if (types == NULL && !mounttype && !is_existing_file(spec)) { - if (strchr (spec, ':') != NULL) { - types = "nfs"; - if (verbose) - printf(_("mount: no type was given - " - "I'll assume nfs because of the colon\n")); - } else if(!strncmp(spec, "//", 2)) { - types = "smbfs"; - if (verbose) - printf(_("mount: no type was given - " - "I'll assume smbfs because of the // prefix\n")); - } - } - - /* - * Try to mount the file system. When the exit status is EX_BG, - * we will retry in the background. Otherwise, we're done. - */ - status = try_mount_one (spec, node, types, opts, freq, pass, 0, 0); - if (status != EX_BG) - return status; + int status, status2; + const char *nspec; + + /* Substitute values in opts, if required */ + opts = usersubst(opts); + + /* Merge the fstab and command line options. */ + if (opts == NULL) + opts = cmdlineopts; + else if (cmdlineopts != NULL) + opts = xstrconcat3(opts, ",", cmdlineopts); + + /* Handle possible LABEL= and UUID= forms of spec */ + nspec = mount_get_devname_for_mounting(spec); + if (nspec) + spec = nspec; + + if (types == NULL && !mounttype && !is_existing_file(spec)) { + if (strchr (spec, ':') != NULL) { + types = "nfs"; + if (verbose) + printf(_("mount: no type was given - " + "I'll assume nfs because of " + "the colon\n")); + } else if(!strncmp(spec, "//", 2)) { + types = "smbfs"; + if (verbose) + printf(_("mount: no type was given - " + "I'll assume smbfs because of " + "the // prefix\n")); + } + } - /* - * Retry in the background. - */ - printf (_("mount: backgrounding \"%s\"\n"), spec); - fflush( stdout ); /* prevent duplicate output */ - if (fork() > 0) - return 0; /* parent returns "success" */ - spec = xstrdup(spec); /* arguments will be destroyed */ - node = xstrdup(node); /* by set_proc_name() */ - types = xstrdup(types); - opts = xstrdup(opts); - set_proc_name (spec); /* make a nice "ps" listing */ - status2 = try_mount_one (spec, node, types, opts, freq, pass, 1, 0); - if (verbose && status2) - printf (_("mount: giving up \"%s\"\n"), spec); - exit (0); /* child stops here */ + /* + * Try to mount the file system. When the exit status is EX_BG, + * we will retry in the background. Otherwise, we're done. + */ + status = try_mount_one (spec, node, types, opts, freq, pass, 0, 0); + if (status != EX_BG) + return status; + + /* + * Retry in the background. + */ + printf (_("mount: backgrounding \"%s\"\n"), spec); + fflush( stdout ); /* prevent duplicate output */ + if (fork() > 0) + return 0; /* parent returns "success" */ + spec = xstrdup(spec); /* arguments will be destroyed */ + node = xstrdup(node); /* by set_proc_name() */ + types = xstrdup(types); + opts = xstrdup(opts); + set_proc_name (spec); /* make a nice "ps" listing */ + status2 = try_mount_one (spec, node, types, opts, freq, pass, 1, 0); + if (verbose && status2) + printf (_("mount: giving up \"%s\"\n"), spec); + exit (0); /* child stops here */ } /* Check if an fsname/dir pair was already in the old mtab. */ @@ -1177,6 +1209,8 @@ mounted (const char *spec0, const char *node0) { /* Handle possible UUID= and LABEL= in spec */ spec0 = mount_get_devname(spec0); + if (!spec0) + return ret; spec = canonicalize(spec0); node = canonicalize(node0); @@ -1189,8 +1223,8 @@ mounted (const char *spec0, const char *node0) { break; } - free(spec); - free(node); + my_free(spec); + my_free(node); return ret; } @@ -1407,14 +1441,17 @@ usage (FILE *fp, int n) { exit (n); } +char *progname; + int -main (int argc, char *argv[]) { +main(int argc, char *argv[]) { int c, result = 0, specseen; char *options = NULL, *test_opts = NULL, *node; const char *spec; char *volumelabel = NULL; char *uuid = NULL; char *types = NULL; + char *p; struct mntentchn *mc; int fd; @@ -1423,6 +1460,10 @@ main (int argc, char *argv[]) { bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); + progname = argv[0]; + if ((p = strrchr(progname, '/')) != NULL) + progname = p+1; + umask(033); /* People report that a mount called from init without console diff --git a/mount/mount_blkid.c b/mount/mount_blkid.c index 7abadec2..47c48b39 100644 --- a/mount/mount_blkid.c +++ b/mount/mount_blkid.c @@ -57,7 +57,7 @@ mount_blkid_put_cache(void) { const char * mount_get_volume_label_by_spec(const char *spec) { - return strdup(get_volume_label_by_spec(spec)); + return xstrdup(get_volume_label_by_spec(spec)); } const char * diff --git a/mount/mount_by_label.c b/mount/mount_by_label.c index 80d252ca..c804e203 100644 --- a/mount/mount_by_label.c +++ b/mount/mount_by_label.c @@ -94,7 +94,7 @@ uuidcache_init_lvm(void) { sprintf(lvm_device, "%s/%s/%s", DEVLABELDIR, vg_iter->d_name, lv_iter->d_name); if (!get_label_uuid(lvm_device, &label, uuid)) - uuidcache_addentry(strdup(lvm_device), + uuidcache_addentry(xstrdup(lvm_device), label, uuid); } closedir(lv_list); @@ -117,7 +117,7 @@ uuidcache_init_evms(void) { while (fgets(line, sizeof(line), procvol)) { if (sscanf(line, "%*d %*d %*d %*s %*s %[^\n]", volname) == 1) { if (!get_label_uuid(volname, &label, uuid)) - uuidcache_addentry(strdup(volname), label, uuid); + uuidcache_addentry(xstrdup(volname), label, uuid); } } @@ -243,7 +243,7 @@ uuidcache_init(void) { */ sprintf(device, "%s/%s", DEVLABELDIR, ptname); if (!get_label_uuid(device, &label, uuid)) - uuidcache_addentry(strdup(device), label, uuid); + uuidcache_addentry(xstrdup(device), label, uuid); } } } diff --git a/mount/mount_guess_fstype.c b/mount/mount_guess_fstype.c index 96220db3..54ff3b8d 100644 --- a/mount/mount_guess_fstype.c +++ b/mount/mount_guess_fstype.c @@ -559,7 +559,7 @@ procfsnext(FILE *procfs) { while (fgets(line, sizeof(line), procfs)) { if (sscanf (line, "nodev %[^\n]\n", fsname) == 1) continue; if (sscanf (line, " %[^ \n]\n", fsname) != 1) continue; - return strdup(fsname); + return xstrdup(fsname); } return 0; } diff --git a/mount/mount_guess_rootdev.c b/mount/mount_guess_rootdev.c index 1c63cd7c..c0f0f503 100644 --- a/mount/mount_guess_rootdev.c +++ b/mount/mount_guess_rootdev.c @@ -60,7 +60,7 @@ rootdev(char *p) { sprintf(devname, "/dev/%s%c", type, let); else sprintf(devname, "/dev/%s%c%d", type, let, mi); - return strdup(devname); + return xstrdup(devname); } return NULL; } diff --git a/mount/swapon.8 b/mount/swapon.8 index 6dca7eb3..223ea506 100644 --- a/mount/swapon.8 +++ b/mount/swapon.8 @@ -80,8 +80,8 @@ Not available before Linux 2.1.25. .B \-a All devices marked as ``swap'' swap devices in .I /etc/fstab -are made available. Devices that are already running as swap are silently -skipped. +are made available, except for those with the ``noauto'' option. +Devices that are already running as swap are silently skipped. .TP .B \-e When diff --git a/mount/swapon.c b/mount/swapon.c index 71b25150..f347c2c7 100644 --- a/mount/swapon.c +++ b/mount/swapon.c @@ -315,6 +315,7 @@ main_swapon(int argc, char *argv[]) { } while ((fstab = getmntent(fp)) != NULL) { char *special = fstab->mnt_fsname; + int skip = 0; if (streq(fstab->mnt_type, MNTTYPE_SWAP) && !is_in_proc_swaps(special) @@ -323,10 +324,14 @@ main_swapon(int argc, char *argv[]) { char *opt, *opts = strdup(fstab->mnt_opts); for (opt = strtok(opts, ","); opt != NULL; - opt = strtok(NULL, ",")) + opt = strtok(NULL, ",")) { if (strncmp(opt, "pri=", 4) == 0) priority = atoi(opt+4); - status |= do_swapon(special, priority); + if (strcmp(opt, "noauto") == 0) + skip = 1; + } + if (!skip) + status |= do_swapon(special, priority); } } fclose(fp); diff --git a/mount/umount.8 b/mount/umount.8 index 3449779e..fafbff26 100644 --- a/mount/umount.8 +++ b/mount/umount.8 @@ -74,6 +74,9 @@ In case unmounting fails, try to remount read-only. In case the unmounted device was a loop device, also free this loop device. .TP +.B \-i +Don't call the /sbin/umount. helper even if it exists. By default /sbin/umount. helper is called if one exists. +.TP .B \-a All of the file systems described in .I /etc/mtab diff --git a/mount/umount.c b/mount/umount.c index c26246c5..bebc8ad7 100644 --- a/mount/umount.c +++ b/mount/umount.c @@ -1,32 +1,5 @@ /* - * A umount(8) for Linux 0.99. - * umount.c,v 1.1.1.1 1993/11/18 08:40:51 jrs Exp - * - * Wed Sep 14 22:43:54 1994: Sebastian Lederer - * (lederer@next-pc.informatik.uni-bonn.de) added support for sending an - * unmount RPC call to the server when an NFS-filesystem is unmounted. - * - * Tue Sep 26 16:33:09 1995: Added patches from Greg Page (greg@caldera.com) - * so that NetWare filesystems can be unmounted. - * - * 951213: Marek Michalkiewicz : - * Ignore any RPC errors, so that you can umount an nfs mounted filesystem - * if the server is down. - * - * 960223: aeb - several minor changes - * 960324: aeb - added some changes from Rob Leslie - * 960823: aeb - also try umount(spec) when umount(node) fails - * 970307: aeb - canonicalise names from fstab - * 970726: aeb - remount read-only in cases where umount fails - * 980810: aeb - umount2 support - * 981222: aeb - If mount point or special file occurs several times - * in mtab, try them all, with last one tried first - * - Differentiate "user" and "users" key words in fstab - * 001202: aeb - remove at most one line from /etc/mtab - * 010716: Michael K. Johnson @@ -36,6 +9,7 @@ #include #include #include +#include #include #include "mount_constants.h" #include "sundries.h" @@ -91,6 +65,10 @@ umount2(const char *path, int flags) { #define MNT_DETACH 2 #endif + +/* True if we are allowed to call /sbin/umount.${FSTYPE} */ +int external_allowed = 1; + /* Nonzero for force umount (-f). There is kernel support since 2.1.116. */ int force = 0; @@ -112,15 +90,61 @@ int verbose = 0; /* True if ruid != euid. */ int suid = 0; -#ifdef USE_SPECIAL_UMOUNTPROG -/* unimplemented so far */ +/* + * check_special_umountprog() + * If there is a special umount program for this type, exec it. + * returns: 0: no exec was done, 1: exec was done, status has result + */ static int -check_special_umountprog() { - /* find type from command line or /etc/mtab; - stat /sbin/umount.%s - if it exists, use it */ +check_special_umountprog(const char *spec, const char *node, + const char *type, int *status) { + char umountprog[120]; + struct stat statbuf; + int res; + + if (!external_allowed) + return 0; + + if (type && strlen(type) < 100) { + sprintf(umountprog, "/sbin/umount.%s", type); + if (stat(umountprog, &statbuf) == 0) { + res = fork(); + if (res == 0) { + char *umountargs[8]; + int i = 0; + + setuid(getuid()); + setgid(getgid()); + umountargs[i++] = umountprog; + umountargs[i++] = xstrdup(node); + if (nomtab) + umountargs[i++] = "-n"; + if (lazy) + umountargs[i++] = "-l"; + if (force) + umountargs[i++] = "-f"; + if (verbose) + umountargs[i++] = "-v"; + if (remount) + umountargs[i++] = "-r"; + umountargs[i] = NULL; + execv(umountprog, umountargs); + exit(1); /* exec failed */ + } else if (res != -1) { + int st; + wait(&st); + *status = (WIFEXITED(st) ? WEXITSTATUS(st) + : EX_SYSERR); + return 1; + } else { + int errsv = errno; + error(_("umount: cannot fork: %s"), + strerror(errsv)); + } + } + } + return 0; } -#endif #ifdef HAVE_NFS static int xdr_dir(XDR *xdrsp, char *dirp) @@ -248,6 +272,7 @@ umount_one (const char *spec, const char *node, const char *type, int umnt_err, umnt_err2; int isroot; int res; + int status; const char *loopdev; /* Special case for root. As of 0.99pl10 we can (almost) unmount root; @@ -260,6 +285,13 @@ umount_one (const char *spec, const char *node, const char *type, || streq (node, "rootfs")); if (isroot) nomtab++; + + /* + * Call umount.TYPE for types that require a separate umount program. + * All such special things must occur isolated in the types string. + */ + if (check_special_umountprog(spec, node, type, &status)) + return status; #ifdef HAVE_NFS /* Ignore any RPC errors, so that you can umount the filesystem @@ -322,7 +354,7 @@ umount_one (const char *spec, const char *node, const char *type, spec); remnt.mnt_type = remnt.mnt_fsname = NULL; remnt.mnt_dir = xstrdup(node); - remnt.mnt_opts = "ro"; + remnt.mnt_opts = xstrdup("ro"); update_mtab(node, &remnt); return 0; } else if (errno != EBUSY) { /* hmm ... */ @@ -514,7 +546,8 @@ static int umount_file (char *arg) { struct mntentchn *mc, *fs; const char *file, *options; - int fstab_has_user, fstab_has_users, fstab_has_owner, ok; + int fstab_has_user, fstab_has_users, fstab_has_owner, fstab_has_group; + int ok; file = canonicalize(arg); /* mtab paths are canonicalized */ if (verbose > 1) @@ -556,16 +589,17 @@ umount_file (char *arg) { "the fstab"), file); } - /* User mounting and unmounting is allowed only - if fstab contains one of the options `user', - `users' or `owner'. */ - /* The option `users' allows arbitrary users to mount - and unmount - this may be a security risk. */ - /* The option `user' only allows unmounting by the user - that mounted. */ - /* The option `owner' only allows (un)mounting by the owner. */ - /* A convenient side effect is that the user who mounted - is visible in mtab. */ + /* + * User mounting and unmounting is allowed only + * if fstab contains one of the options `user', + * `users' or `owner' or `group'. + * + * The option `users' allows arbitrary users to mount + * and unmount - this may be a security risk. + * + * The options `user', `owner' and `group' only allow + * unmounting by the user that mounted (visible in mtab). + */ options = fs->m.mnt_opts; if (!options) @@ -573,12 +607,14 @@ umount_file (char *arg) { fstab_has_user = contains(options, "user"); fstab_has_users = contains(options, "users"); fstab_has_owner = contains(options, "owner"); + fstab_has_group = contains(options, "group"); ok = 0; if (fstab_has_users) ok = 1; - if (!ok && (fstab_has_user || fstab_has_owner)) { + if (!ok && (fstab_has_user || fstab_has_owner || + fstab_has_group)) { char *user = getusername(); options = mc->m.mnt_opts; @@ -601,11 +637,13 @@ umount_file (char *arg) { return umount_one (arg, arg, arg, arg, NULL); } +char *progname; + int main (int argc, char *argv[]) { int c; int all = 0; - char *types = NULL, *test_opts = NULL; + char *types = NULL, *test_opts = NULL, *p; int result = 0; sanitize_env(); @@ -613,9 +651,13 @@ main (int argc, char *argv[]) { bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); + progname = argv[0]; + if ((p = strrchr(progname, '/')) != NULL) + progname = p+1; + umask(033); - while ((c = getopt_long (argc, argv, "adfhlnrt:O:vV", + while ((c = getopt_long (argc, argv, "adfhlnrit:O:vV", longopts, NULL)) != -1) switch (c) { case 'a': /* umount everything */ @@ -652,6 +694,9 @@ main (int argc, char *argv[]) { case 't': /* specify file system type */ types = optarg; break; + case 'i': + external_allowed = 0; + break; case 0: break; case '?': diff --git a/po/ca.po b/po/ca.po index 1f5c63ba..3216127b 100644 --- a/po/ca.po +++ b/po/ca.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: util-linux 2.12\n" -"POT-Creation-Date: 2004-11-04 20:48+0100\n" +"POT-Creation-Date: 2004-12-05 20:08+0100\n" "PO-Revision-Date: 2003-08-01 10:59+0200\n" "Last-Translator: Antoni Bella Perez \n" "Language-Team: Catalan \n" @@ -158,7 +158,7 @@ msgstr "ús: %s [ -n ] dispositiu\n" #: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:55 #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626 #: disk-utils/mkswap.c:462 disk-utils/setfdprm.c:128 hwclock/hwclock.c:1175 -#: misc-utils/cal.c:248 misc-utils/ddate.c:180 misc-utils/kill.c:189 +#: misc-utils/cal.c:313 misc-utils/ddate.c:180 misc-utils/kill.c:189 #: misc-utils/rename.c:79 misc-utils/script.c:143 #, c-format msgid "%s from %s\n" @@ -766,7 +766,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:2204 +#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2224 #, c-format msgid "Device: %s\n" msgstr "Dispositiu: %s\n" @@ -1145,7 +1145,7 @@ msgid "too many bad pages" msgstr "hi han masses pàgines incorrectes" #: disk-utils/mkswap.c:363 misc-utils/look.c:183 misc-utils/setterm.c:1145 -#: text-utils/more.c:2090 text-utils/more.c:2101 +#: text-utils/more.c:1975 text-utils/more.c:1986 msgid "Out of memory" msgstr "Memòria esgotada" @@ -1264,11 +1264,11 @@ 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:370 fdisk/cfdisk.c:2000 +#: fdisk/cfdisk.c:370 fdisk/cfdisk.c:2004 msgid "Unusable" msgstr "Inutilitzable" -#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2002 +#: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2006 msgid "Free Space" msgstr "Espai lliure" @@ -1410,8 +1410,8 @@ msgstr "Tecla no permesa" msgid "Press a key to continue" msgstr "Premeu una tecla per a continuar" -#: fdisk/cfdisk.c:1370 fdisk/cfdisk.c:1971 fdisk/cfdisk.c:2503 -#: fdisk/cfdisk.c:2505 +#: fdisk/cfdisk.c:1370 fdisk/cfdisk.c:1975 fdisk/cfdisk.c:2507 +#: fdisk/cfdisk.c:2509 msgid "Primary" msgstr "Primària" @@ -1419,8 +1419,8 @@ msgstr "Primària" msgid "Create a new primary partition" msgstr "Crear una nova partició primària" -#: fdisk/cfdisk.c:1371 fdisk/cfdisk.c:1971 fdisk/cfdisk.c:2502 -#: fdisk/cfdisk.c:2505 +#: fdisk/cfdisk.c:1371 fdisk/cfdisk.c:1975 fdisk/cfdisk.c:2506 +#: fdisk/cfdisk.c:2509 msgid "Logical" msgstr "Lògica" @@ -1428,7 +1428,7 @@ msgstr "Lògica" msgid "Create a new logical partition" msgstr "Crear una nova partició lògica" -#: fdisk/cfdisk.c:1372 fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2176 +#: fdisk/cfdisk.c:1372 fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2180 msgid "Cancel" msgstr "Cancel·lar" @@ -1464,179 +1464,179 @@ msgstr "Afegir partició al final de l'espai lliure" msgid "No room to create the extended partition" msgstr "No hi ha espai per a crear la partició estesa" -#: fdisk/cfdisk.c:1502 +#: fdisk/cfdisk.c:1506 #, fuzzy msgid "No partition table.\n" msgstr "no hi ha cap taula de particions.\n" -#: fdisk/cfdisk.c:1506 +#: fdisk/cfdisk.c:1510 #, fuzzy msgid "No partition table. Starting with zero table." msgstr "No hi ha taula de partició o aquesta té una firma desconeguda" -#: fdisk/cfdisk.c:1516 +#: fdisk/cfdisk.c:1520 #, fuzzy msgid "Bad signature on partition table" msgstr "Sols imprimir la taula de particions" -#: fdisk/cfdisk.c:1520 +#: fdisk/cfdisk.c:1524 #, fuzzy msgid "Unknown partition table type" msgstr "no hi ha cap taula de particions.\n" -#: fdisk/cfdisk.c:1522 +#: fdisk/cfdisk.c:1526 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:1570 +#: fdisk/cfdisk.c:1574 msgid "You specified more cylinders than fit on disk" msgstr "Heu especificat més cilindres dels que caben al disc" -#: fdisk/cfdisk.c:1602 +#: fdisk/cfdisk.c:1606 msgid "Cannot open disk drive" msgstr "No es pot obrir la unitat de disc" -#: fdisk/cfdisk.c:1604 fdisk/cfdisk.c:1784 +#: fdisk/cfdisk.c:1608 fdisk/cfdisk.c:1788 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:1625 +#: fdisk/cfdisk.c:1629 msgid "Cannot get disk size" msgstr "No es pot obtindre la mida del disc" -#: fdisk/cfdisk.c:1651 +#: fdisk/cfdisk.c:1655 msgid "Bad primary partition" msgstr "Partició primària incorrecta" -#: fdisk/cfdisk.c:1681 +#: fdisk/cfdisk.c:1685 msgid "Bad logical partition" msgstr "Partició lògica incorrecta" -#: fdisk/cfdisk.c:1796 +#: fdisk/cfdisk.c:1800 msgid "Warning!! This may destroy data on your disk!" msgstr "Atenció!! Això pot destruir les dades del vostre disc!" -#: fdisk/cfdisk.c:1800 +#: fdisk/cfdisk.c:1804 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:1806 +#: fdisk/cfdisk.c:1810 msgid "no" msgstr "no" -#: fdisk/cfdisk.c:1807 +#: fdisk/cfdisk.c:1811 msgid "Did not write partition table to disk" msgstr "No s'ha escrit la taula de particions al disc" -#: fdisk/cfdisk.c:1809 +#: fdisk/cfdisk.c:1813 msgid "yes" msgstr "si" -#: fdisk/cfdisk.c:1812 +#: fdisk/cfdisk.c:1816 msgid "Please enter `yes' or `no'" msgstr "Si us plau escriviu `si' o `no'" -#: fdisk/cfdisk.c:1816 +#: fdisk/cfdisk.c:1820 msgid "Writing partition table to disk..." msgstr "Escrivint la taula de particions al disc..." -#: fdisk/cfdisk.c:1841 fdisk/cfdisk.c:1845 +#: fdisk/cfdisk.c:1845 fdisk/cfdisk.c:1849 msgid "Wrote partition table to disk" msgstr "Taula de particions del disc, escrita" -#: fdisk/cfdisk.c:1843 +#: fdisk/cfdisk.c:1847 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:1853 +#: fdisk/cfdisk.c:1857 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:1855 +#: fdisk/cfdisk.c:1859 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:1913 fdisk/cfdisk.c:2032 fdisk/cfdisk.c:2116 +#: fdisk/cfdisk.c:1917 fdisk/cfdisk.c:2036 fdisk/cfdisk.c:2120 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:1922 fdisk/cfdisk.c:2040 fdisk/cfdisk.c:2124 +#: fdisk/cfdisk.c:1926 fdisk/cfdisk.c:2044 fdisk/cfdisk.c:2128 #, c-format msgid "Cannot open file '%s'" msgstr "No es pot obrir el fitxer '%s'" -#: fdisk/cfdisk.c:1933 +#: fdisk/cfdisk.c:1937 #, c-format msgid "Disk Drive: %s\n" msgstr "Unitat de disc: %s\n" -#: fdisk/cfdisk.c:1935 +#: fdisk/cfdisk.c:1939 msgid "Sector 0:\n" msgstr "Sector 0:\n" -#: fdisk/cfdisk.c:1942 +#: fdisk/cfdisk.c:1946 #, c-format msgid "Sector %d:\n" msgstr "Sector %d:\n" -#: fdisk/cfdisk.c:1962 +#: fdisk/cfdisk.c:1966 msgid " None " msgstr " Cap " -#: fdisk/cfdisk.c:1964 +#: fdisk/cfdisk.c:1968 msgid " Pri/Log" msgstr " Pri/Lòg" -#: fdisk/cfdisk.c:1966 +#: fdisk/cfdisk.c:1970 msgid " Primary" msgstr " Primària" -#: fdisk/cfdisk.c:1968 +#: fdisk/cfdisk.c:1972 msgid " Logical" msgstr " Lògica" #. odd flag on end #. type id #. type name -#: fdisk/cfdisk.c:2006 fdisk/fdisk.c:1419 fdisk/fdisk.c:1725 +#: fdisk/cfdisk.c:2010 fdisk/fdisk.c:1433 fdisk/fdisk.c:1745 #: fdisk/fdisksgilabel.c:237 fdisk/fdisksunlabel.c:689 fdisk/sfdisk.c:650 msgid "Unknown" msgstr "Desconegut" -#: fdisk/cfdisk.c:2012 fdisk/cfdisk.c:2480 fdisk/fdisksunlabel.c:45 +#: fdisk/cfdisk.c:2016 fdisk/cfdisk.c:2484 fdisk/fdisksunlabel.c:45 msgid "Boot" msgstr "Arrencada" -#: fdisk/cfdisk.c:2014 +#: fdisk/cfdisk.c:2018 #, c-format msgid "(%02X)" msgstr "(%02X)" -#: fdisk/cfdisk.c:2016 +#: fdisk/cfdisk.c:2020 msgid "None" msgstr "Cap" -#: fdisk/cfdisk.c:2051 fdisk/cfdisk.c:2135 +#: fdisk/cfdisk.c:2055 fdisk/cfdisk.c:2139 #, c-format msgid "Partition Table for %s\n" msgstr "Taula de particions per a %s\n" -#: fdisk/cfdisk.c:2053 +#: fdisk/cfdisk.c:2057 msgid " First Last\n" msgstr " Primer Últim\n" -#: fdisk/cfdisk.c:2054 +#: fdisk/cfdisk.c:2058 msgid "" " # Type Sector Sector Offset Length Filesystem Type (ID) " "Flag\n" @@ -1646,7 +1646,7 @@ msgstr "" " # Tipus Sector Sector Despl. Long. (ID) Sist. Fitxers " "Etiqueta\n" -#: fdisk/cfdisk.c:2055 +#: fdisk/cfdisk.c:2059 msgid "" "-- ------- ----------- ----------- ------ ----------- -------------------- " "----\n" @@ -1655,467 +1655,467 @@ msgstr "" "----\n" #. Three-line heading. Read "Start Sector" etc vertically. -#: fdisk/cfdisk.c:2138 +#: fdisk/cfdisk.c:2142 msgid " ---Starting--- ----Ending---- Start Number of\n" msgstr " ---Inici--- ----Final---- Inici Nombre de\n" -#: fdisk/cfdisk.c:2139 +#: fdisk/cfdisk.c:2143 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:2140 +#: fdisk/cfdisk.c:2144 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n" msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n" -#: fdisk/cfdisk.c:2173 +#: fdisk/cfdisk.c:2177 msgid "Raw" msgstr "En cru" -#: fdisk/cfdisk.c:2173 +#: fdisk/cfdisk.c:2177 msgid "Print the table using raw data format" msgstr "Imprimeix la taula utilitzant el format de dades en cru" -#: fdisk/cfdisk.c:2174 fdisk/cfdisk.c:2277 +#: fdisk/cfdisk.c:2178 fdisk/cfdisk.c:2281 msgid "Sectors" msgstr "Sectors" -#: fdisk/cfdisk.c:2174 +#: fdisk/cfdisk.c:2178 msgid "Print the table ordered by sectors" msgstr "Imprimeix la taula ordenada per sectors" -#: fdisk/cfdisk.c:2175 +#: fdisk/cfdisk.c:2179 msgid "Table" msgstr "Taula" -#: fdisk/cfdisk.c:2175 +#: fdisk/cfdisk.c:2179 msgid "Just print the partition table" msgstr "Sols imprimir la taula de particions" -#: fdisk/cfdisk.c:2176 +#: fdisk/cfdisk.c:2180 msgid "Don't print the table" msgstr "No imprimir la taula" -#: fdisk/cfdisk.c:2204 +#: fdisk/cfdisk.c:2208 msgid "Help Screen for cfdisk" msgstr "Pantalla d'ajuda per a cfdisk" -#: fdisk/cfdisk.c:2206 +#: fdisk/cfdisk.c:2210 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" -#: fdisk/cfdisk.c:2207 +#: fdisk/cfdisk.c:2211 msgid "allows you to create, delete and modify partitions on your hard" msgstr "curses, el qual us permetrà crear, suprimir i modificar particions en" -#: fdisk/cfdisk.c:2208 +#: fdisk/cfdisk.c:2212 msgid "disk drive." msgstr "el vostre disc dur." -#: fdisk/cfdisk.c:2210 +#: fdisk/cfdisk.c:2214 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb" msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb" -#: fdisk/cfdisk.c:2212 +#: fdisk/cfdisk.c:2216 msgid "Command Meaning" msgstr "Comandament Significat" -#: fdisk/cfdisk.c:2213 +#: fdisk/cfdisk.c:2217 msgid "------- -------" msgstr "----------- ----------" -#: fdisk/cfdisk.c:2214 +#: fdisk/cfdisk.c:2218 msgid " b Toggle bootable flag of the current partition" msgstr " b Fixa l'etiqueta d'arrencada en la partició actual" -#: fdisk/cfdisk.c:2215 +#: fdisk/cfdisk.c:2219 msgid " d Delete the current partition" msgstr " d Suprimeix l'actual partició" -#: fdisk/cfdisk.c:2216 +#: fdisk/cfdisk.c:2220 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:2217 +#: fdisk/cfdisk.c:2221 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:2218 +#: fdisk/cfdisk.c:2222 msgid " know what they are doing." msgstr " que conegui el funcionament de la mateixa." -#: fdisk/cfdisk.c:2219 +#: fdisk/cfdisk.c:2223 msgid " h Print this screen" msgstr " h Imprimeix aquesta pantalla" -#: fdisk/cfdisk.c:2220 +#: fdisk/cfdisk.c:2224 msgid " m Maximize disk usage of the current partition" msgstr " m Maximitza l'utilització de disc de la partició actual" -#: fdisk/cfdisk.c:2221 +#: fdisk/cfdisk.c:2225 msgid " Note: This may make the partition incompatible with" msgstr " Nota: Aquesta opció pot fer la partició incompatible" -#: fdisk/cfdisk.c:2222 +#: fdisk/cfdisk.c:2226 msgid " DOS, OS/2, ..." msgstr " amb DOS, OS/2, ..." -#: fdisk/cfdisk.c:2223 +#: fdisk/cfdisk.c:2227 msgid " n Create new partition from free space" msgstr " n Crea una nova partició des de l'espai lliure" -#: fdisk/cfdisk.c:2224 +#: fdisk/cfdisk.c:2228 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:2225 +#: fdisk/cfdisk.c:2229 msgid " There are several different formats for the partition" msgstr " Hi han diversos formats diferents per a la partició" -#: fdisk/cfdisk.c:2226 +#: fdisk/cfdisk.c:2230 msgid " that you can choose from:" msgstr " entre els que podeu escollir:" -#: fdisk/cfdisk.c:2227 +#: fdisk/cfdisk.c:2231 msgid " r - Raw data (exactly what would be written to disk)" msgstr " r - Dades en cru (exactament el que s'escriurà al disc)" -#: fdisk/cfdisk.c:2228 +#: fdisk/cfdisk.c:2232 msgid " s - Table ordered by sectors" msgstr " s - Taula ordenada per sectors" -#: fdisk/cfdisk.c:2229 +#: fdisk/cfdisk.c:2233 msgid " t - Table in raw format" msgstr " t - Taula en format en cru" -#: fdisk/cfdisk.c:2230 +#: fdisk/cfdisk.c:2234 msgid " q Quit program without writing partition table" msgstr " q Surt del programa sense escriure la taula de particions" -#: fdisk/cfdisk.c:2231 +#: fdisk/cfdisk.c:2235 msgid " t Change the filesystem type" msgstr " t Canvia el tipus del sistema de fitxers" -#: fdisk/cfdisk.c:2232 +#: fdisk/cfdisk.c:2236 msgid " u Change units of the partition size display" msgstr " u Canvia les unitats de la mida visualitzava de la partició" -#: fdisk/cfdisk.c:2233 +#: fdisk/cfdisk.c:2237 msgid " Rotates through MB, sectors and cylinders" msgstr " Alterna entre MB, sectors i cilindres" -#: fdisk/cfdisk.c:2234 +#: fdisk/cfdisk.c:2238 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:2235 +#: fdisk/cfdisk.c:2239 msgid " Since this might destroy data on the disk, you must" msgstr " Donat que això destruirà les dades del disc, haureu" -#: fdisk/cfdisk.c:2236 +#: fdisk/cfdisk.c:2240 msgid " either confirm or deny the write by entering `yes' or" msgstr " de confirmar o denegar escrivint `si' o" -#: fdisk/cfdisk.c:2237 +#: fdisk/cfdisk.c:2241 msgid " `no'" msgstr " `no'" -#: fdisk/cfdisk.c:2238 +#: fdisk/cfdisk.c:2242 msgid "Up Arrow Move cursor to the previous partition" msgstr "Fletxa amunt Desplaça el cursor a l'anterior partició" -#: fdisk/cfdisk.c:2239 +#: fdisk/cfdisk.c:2243 msgid "Down Arrow Move cursor to the next partition" msgstr "Fletxa avall Desplaça el cursor a la següent partició" -#: fdisk/cfdisk.c:2240 +#: fdisk/cfdisk.c:2244 msgid "CTRL-L Redraws the screen" msgstr "Ctrl-L Redibuixa la pantalla" -#: fdisk/cfdisk.c:2241 +#: fdisk/cfdisk.c:2245 msgid " ? Print this screen" msgstr " ? Imprimeix aquesta pantalla" -#: fdisk/cfdisk.c:2243 +#: fdisk/cfdisk.c:2247 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:2244 +#: fdisk/cfdisk.c:2248 msgid "case letters (except for Writes)." msgstr "minúscules (excepte W per a escriure)." -#: fdisk/cfdisk.c:2275 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320 +#: fdisk/cfdisk.c:2279 fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:320 msgid "Cylinders" msgstr "Cilindres" -#: fdisk/cfdisk.c:2275 +#: fdisk/cfdisk.c:2279 msgid "Change cylinder geometry" msgstr "Canviar la geometria dels cilindres" -#: fdisk/cfdisk.c:2276 fdisk/fdisksunlabel.c:315 +#: fdisk/cfdisk.c:2280 fdisk/fdisksunlabel.c:315 msgid "Heads" msgstr "Capçals" -#: fdisk/cfdisk.c:2276 +#: fdisk/cfdisk.c:2280 msgid "Change head geometry" msgstr "Canviar la geometria dels capçals" -#: fdisk/cfdisk.c:2277 +#: fdisk/cfdisk.c:2281 msgid "Change sector geometry" msgstr "Canviar la geometria dels sectors" -#: fdisk/cfdisk.c:2278 +#: fdisk/cfdisk.c:2282 msgid "Done" msgstr "Fet" -#: fdisk/cfdisk.c:2278 +#: fdisk/cfdisk.c:2282 msgid "Done with changing geometry" msgstr "S'ha finalitzat el canvi de geometria" -#: fdisk/cfdisk.c:2291 +#: fdisk/cfdisk.c:2295 msgid "Enter the number of cylinders: " msgstr "Escriviu el nombre de cilindres: " -#: fdisk/cfdisk.c:2302 fdisk/cfdisk.c:2873 +#: fdisk/cfdisk.c:2306 fdisk/cfdisk.c:2877 msgid "Illegal cylinders value" msgstr "Valor dels cilindres no permes" -#: fdisk/cfdisk.c:2308 +#: fdisk/cfdisk.c:2312 msgid "Enter the number of heads: " msgstr "Escriviu el nombre de capçals: " -#: fdisk/cfdisk.c:2315 fdisk/cfdisk.c:2883 +#: fdisk/cfdisk.c:2319 fdisk/cfdisk.c:2887 msgid "Illegal heads value" msgstr "Valor dels capçals no permes" -#: fdisk/cfdisk.c:2321 +#: fdisk/cfdisk.c:2325 msgid "Enter the number of sectors per track: " msgstr "Escriviu el nombre de sectors per pista: " -#: fdisk/cfdisk.c:2328 fdisk/cfdisk.c:2890 +#: fdisk/cfdisk.c:2332 fdisk/cfdisk.c:2894 msgid "Illegal sectors value" msgstr "Valor dels sectors no permes" -#: fdisk/cfdisk.c:2431 +#: fdisk/cfdisk.c:2435 msgid "Enter filesystem type: " msgstr "Escriviu el tipus del sistema de fitxers: " -#: fdisk/cfdisk.c:2449 +#: fdisk/cfdisk.c:2453 msgid "Cannot change FS Type to empty" msgstr "No es pot canviar el tipus del sistema de fitxers a buit" -#: fdisk/cfdisk.c:2451 +#: fdisk/cfdisk.c:2455 msgid "Cannot change FS Type to extended" msgstr "No es pot canviar el tipus del sistema de fitxers a estes" -#: fdisk/cfdisk.c:2482 +#: fdisk/cfdisk.c:2486 #, c-format msgid "Unk(%02X)" msgstr "Desc.(%02X)" -#: fdisk/cfdisk.c:2485 fdisk/cfdisk.c:2488 +#: fdisk/cfdisk.c:2489 fdisk/cfdisk.c:2492 msgid ", NC" msgstr ", NC" -#: fdisk/cfdisk.c:2493 fdisk/cfdisk.c:2496 +#: fdisk/cfdisk.c:2497 fdisk/cfdisk.c:2500 msgid "NC" msgstr "NC" -#: fdisk/cfdisk.c:2504 +#: fdisk/cfdisk.c:2508 msgid "Pri/Log" msgstr "Pri/Lòg" -#: fdisk/cfdisk.c:2511 +#: fdisk/cfdisk.c:2515 #, c-format msgid "Unknown (%02X)" msgstr "Desconegut (%02X)" -#: fdisk/cfdisk.c:2580 +#: fdisk/cfdisk.c:2584 #, c-format msgid "Disk Drive: %s" msgstr "Unitat de disc: %s" -#: fdisk/cfdisk.c:2587 +#: fdisk/cfdisk.c:2591 #, c-format msgid "Size: %lld bytes, %lld MB" msgstr "Mida: %lld octets, %lld MB" -#: fdisk/cfdisk.c:2590 +#: fdisk/cfdisk.c:2594 #, c-format msgid "Size: %lld bytes, %lld.%lld GB" msgstr "Mida: %lld octets, %lld.%lld GB" -#: fdisk/cfdisk.c:2594 +#: fdisk/cfdisk.c:2598 #, c-format msgid "Heads: %d Sectors per Track: %d Cylinders: %lld" msgstr "Capçals: %d Sectors per pista: %d Cilindres: %lld" -#: fdisk/cfdisk.c:2598 +#: fdisk/cfdisk.c:2602 msgid "Name" msgstr "Nom" -#: fdisk/cfdisk.c:2599 +#: fdisk/cfdisk.c:2603 msgid "Flags" msgstr "Etiquetes" -#: fdisk/cfdisk.c:2600 +#: fdisk/cfdisk.c:2604 msgid "Part Type" msgstr "Tipus part." -#: fdisk/cfdisk.c:2601 +#: fdisk/cfdisk.c:2605 msgid "FS Type" msgstr "Tipus Sis.Fitx." -#: fdisk/cfdisk.c:2602 +#: fdisk/cfdisk.c:2606 msgid "[Label]" msgstr "[Etiqueta]" -#: fdisk/cfdisk.c:2604 +#: fdisk/cfdisk.c:2608 msgid " Sectors" msgstr " Sectors" -#: fdisk/cfdisk.c:2606 +#: fdisk/cfdisk.c:2610 msgid " Cylinders" msgstr " Cilindres" -#: fdisk/cfdisk.c:2608 +#: fdisk/cfdisk.c:2612 msgid " Size (MB)" msgstr " Mida (MB)" -#: fdisk/cfdisk.c:2610 +#: fdisk/cfdisk.c:2614 msgid " Size (GB)" msgstr " Mida (GB)" -#: fdisk/cfdisk.c:2664 +#: fdisk/cfdisk.c:2668 msgid "Bootable" msgstr "Arrencada" -#: fdisk/cfdisk.c:2664 +#: fdisk/cfdisk.c:2668 msgid "Toggle bootable flag of the current partition" msgstr "Establir l'etiqueta de la partició actual com d'arrencada" -#: fdisk/cfdisk.c:2665 +#: fdisk/cfdisk.c:2669 msgid "Delete" msgstr "Suprimir" -#: fdisk/cfdisk.c:2665 +#: fdisk/cfdisk.c:2669 msgid "Delete the current partition" msgstr "Suprimir l'actual partició" -#: fdisk/cfdisk.c:2666 +#: fdisk/cfdisk.c:2670 msgid "Geometry" msgstr "Geometria" -#: fdisk/cfdisk.c:2666 +#: fdisk/cfdisk.c:2670 msgid "Change disk geometry (experts only)" msgstr "Canviar la geometria del disc (sols usuaris experts)" -#: fdisk/cfdisk.c:2667 +#: fdisk/cfdisk.c:2671 msgid "Help" msgstr "Ajuda" -#: fdisk/cfdisk.c:2667 +#: fdisk/cfdisk.c:2671 msgid "Print help screen" msgstr "Imprimir pantalla d'ajuda" -#: fdisk/cfdisk.c:2668 +#: fdisk/cfdisk.c:2672 msgid "Maximize" msgstr "Maximitza" -#: fdisk/cfdisk.c:2668 +#: fdisk/cfdisk.c:2672 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:2669 +#: fdisk/cfdisk.c:2673 msgid "New" msgstr "Nova" -#: fdisk/cfdisk.c:2669 +#: fdisk/cfdisk.c:2673 msgid "Create new partition from free space" msgstr "Crear una nova partició des de l'espai lliure" -#: fdisk/cfdisk.c:2670 +#: fdisk/cfdisk.c:2674 msgid "Print" msgstr "Imprimir" -#: fdisk/cfdisk.c:2670 +#: fdisk/cfdisk.c:2674 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:2671 +#: fdisk/cfdisk.c:2675 msgid "Quit" msgstr "Sortir" -#: fdisk/cfdisk.c:2671 +#: fdisk/cfdisk.c:2675 msgid "Quit program without writing partition table" msgstr "Sortir del programa sense escriure la taula de particions" -#: fdisk/cfdisk.c:2672 +#: fdisk/cfdisk.c:2676 msgid "Type" msgstr "Tipus" -#: fdisk/cfdisk.c:2672 +#: fdisk/cfdisk.c:2676 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:2673 +#: fdisk/cfdisk.c:2677 msgid "Units" msgstr "Unitats" -#: fdisk/cfdisk.c:2673 +#: fdisk/cfdisk.c:2677 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:2674 +#: fdisk/cfdisk.c:2678 msgid "Write" msgstr "Escriure" -#: fdisk/cfdisk.c:2674 +#: fdisk/cfdisk.c:2678 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:2720 +#: fdisk/cfdisk.c:2724 msgid "Cannot make this partition bootable" msgstr "No es pot fer aquesta partició arrencable" -#: fdisk/cfdisk.c:2730 +#: fdisk/cfdisk.c:2734 msgid "Cannot delete an empty partition" msgstr "No es pot suprimir una partició buida" -#: fdisk/cfdisk.c:2750 fdisk/cfdisk.c:2752 +#: fdisk/cfdisk.c:2754 fdisk/cfdisk.c:2756 msgid "Cannot maximize this partition" msgstr "No es pot maximitzar aquesta partició" -#: fdisk/cfdisk.c:2760 +#: fdisk/cfdisk.c:2764 msgid "This partition is unusable" msgstr "Aquesta partició és inutilitzable" -#: fdisk/cfdisk.c:2762 +#: fdisk/cfdisk.c:2766 msgid "This partition is already in use" msgstr "Aquesta partició ja està en ús" -#: fdisk/cfdisk.c:2779 +#: fdisk/cfdisk.c:2783 msgid "Cannot change the type of an empty partition" msgstr "No es pot canviar el tipus d'una partició buida" -#: fdisk/cfdisk.c:2806 fdisk/cfdisk.c:2812 +#: fdisk/cfdisk.c:2810 fdisk/cfdisk.c:2816 msgid "No more partitions" msgstr "No hi ha més particions" -#: fdisk/cfdisk.c:2819 +#: fdisk/cfdisk.c:2823 msgid "Illegal command" msgstr "Comandament no permès" -#: fdisk/cfdisk.c:2829 +#: fdisk/cfdisk.c:2833 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n" msgstr "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n" #. Unfortunately, xgettext does not handle multi-line strings #. so, let's use explicit \n's instead -#: fdisk/cfdisk.c:2836 +#: fdisk/cfdisk.c:2840 #, c-format msgid "" "\n" @@ -2221,189 +2221,189 @@ msgstr "No es pot assignar més memòria\n" msgid "Fatal error\n" msgstr "Error fatal\n" -#: fdisk/fdisk.c:316 fdisk/fdisk.c:335 fdisk/fdisk.c:353 fdisk/fdisk.c:360 -#: fdisk/fdisk.c:383 fdisk/fdisk.c:401 fdisk/fdisk.c:417 fdisk/fdisk.c:433 +#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:367 fdisk/fdisk.c:374 +#: fdisk/fdisk.c:397 fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:447 #: fdisk/fdiskbsdlabel.c:129 msgid "Command action" msgstr "Acció del comandament" -#: fdisk/fdisk.c:317 +#: fdisk/fdisk.c:331 msgid " a toggle a read only flag" msgstr " a establir un indicador de sols lectura" #. sun -#: fdisk/fdisk.c:318 fdisk/fdisk.c:362 +#: fdisk/fdisk.c:332 fdisk/fdisk.c:376 msgid " b edit bsd disklabel" msgstr " b editar etiqueta de disc bsd" -#: fdisk/fdisk.c:319 +#: fdisk/fdisk.c:333 msgid " c toggle the mountable flag" msgstr " c establir indicatiu de muntable" #. sun -#: fdisk/fdisk.c:320 fdisk/fdisk.c:339 fdisk/fdisk.c:364 +#: fdisk/fdisk.c:334 fdisk/fdisk.c:353 fdisk/fdisk.c:378 msgid " d delete a partition" msgstr " d suprimir una partició" -#: fdisk/fdisk.c:321 fdisk/fdisk.c:340 fdisk/fdisk.c:365 +#: fdisk/fdisk.c:335 fdisk/fdisk.c:354 fdisk/fdisk.c:379 msgid " l list known partition types" msgstr " l llistar els tipus de particions conegudes" #. sun -#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:354 fdisk/fdisk.c:366 -#: fdisk/fdisk.c:391 fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:441 +#: fdisk/fdisk.c:336 fdisk/fdisk.c:355 fdisk/fdisk.c:368 fdisk/fdisk.c:380 +#: fdisk/fdisk.c:405 fdisk/fdisk.c:422 fdisk/fdisk.c:438 fdisk/fdisk.c:455 #: fdisk/fdiskbsdlabel.c:134 msgid " m print this menu" msgstr " m imprimir aquest menú" -#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:367 +#: fdisk/fdisk.c:337 fdisk/fdisk.c:356 fdisk/fdisk.c:381 msgid " n add a new partition" msgstr " n afegir una nova partició" -#: fdisk/fdisk.c:324 fdisk/fdisk.c:343 fdisk/fdisk.c:355 fdisk/fdisk.c:368 +#: fdisk/fdisk.c:338 fdisk/fdisk.c:357 fdisk/fdisk.c:369 fdisk/fdisk.c:382 msgid " o create a new empty DOS partition table" msgstr " o crear una nova taula de particions DOS buida" -#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:369 fdisk/fdisk.c:392 -#: fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:442 +#: fdisk/fdisk.c:339 fdisk/fdisk.c:358 fdisk/fdisk.c:383 fdisk/fdisk.c:406 +#: fdisk/fdisk.c:423 fdisk/fdisk.c:439 fdisk/fdisk.c:456 msgid " p print the partition table" msgstr " p imprimir la taula de particions" -#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:356 fdisk/fdisk.c:370 -#: fdisk/fdisk.c:393 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:443 +#: fdisk/fdisk.c:340 fdisk/fdisk.c:359 fdisk/fdisk.c:370 fdisk/fdisk.c:384 +#: fdisk/fdisk.c:407 fdisk/fdisk.c:424 fdisk/fdisk.c:440 fdisk/fdisk.c:457 #: fdisk/fdiskbsdlabel.c:137 msgid " q quit without saving changes" msgstr " q sortir sense desar els canvis" -#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:357 fdisk/fdisk.c:371 +#: fdisk/fdisk.c:341 fdisk/fdisk.c:360 fdisk/fdisk.c:371 fdisk/fdisk.c:385 msgid " s create a new empty Sun disklabel" msgstr " s crear una etiqueta de disc Sun nova" #. sun -#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:372 +#: fdisk/fdisk.c:342 fdisk/fdisk.c:361 fdisk/fdisk.c:386 msgid " t change a partition's system id" msgstr " t canviar l'identificador del sistema d'una partició" -#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:373 +#: fdisk/fdisk.c:343 fdisk/fdisk.c:362 fdisk/fdisk.c:387 msgid " u change display/entry units" msgstr " u canviar les unitats de visualització/entrada" -#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374 fdisk/fdisk.c:396 -#: fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446 +#: fdisk/fdisk.c:344 fdisk/fdisk.c:363 fdisk/fdisk.c:388 fdisk/fdisk.c:410 +#: fdisk/fdisk.c:427 fdisk/fdisk.c:443 fdisk/fdisk.c:460 msgid " v verify the partition table" msgstr " v verificar la taula de particions" -#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:375 fdisk/fdisk.c:397 -#: fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447 +#: fdisk/fdisk.c:345 fdisk/fdisk.c:364 fdisk/fdisk.c:389 fdisk/fdisk.c:411 +#: fdisk/fdisk.c:428 fdisk/fdisk.c:444 fdisk/fdisk.c:461 msgid " w write table to disk and exit" msgstr " w escriure la taula al disc i sortir" -#: fdisk/fdisk.c:332 fdisk/fdisk.c:376 +#: fdisk/fdisk.c:346 fdisk/fdisk.c:390 msgid " x extra functionality (experts only)" msgstr " x funcions addicionals (sols experts)" -#: fdisk/fdisk.c:336 +#: fdisk/fdisk.c:350 msgid " a select bootable partition" msgstr " a seleccionar partició d'arrencada" #. sgi flavour -#: fdisk/fdisk.c:337 +#: fdisk/fdisk.c:351 msgid " b edit bootfile entry" msgstr " b editar l'entrada del fitxer d'arrencada" #. sgi -#: fdisk/fdisk.c:338 +#: fdisk/fdisk.c:352 msgid " c select sgi swap partition" msgstr " c seleccionar partició d'intercanvi sgi" -#: fdisk/fdisk.c:361 +#: fdisk/fdisk.c:375 msgid " a toggle a bootable flag" msgstr " a establir un indicatiu d'arrencada" -#: fdisk/fdisk.c:363 +#: fdisk/fdisk.c:377 msgid " c toggle the dos compatibility flag" msgstr " c establir l'indicatiu de compatibilitat amb DOS" -#: fdisk/fdisk.c:384 +#: fdisk/fdisk.c:398 msgid " a change number of alternate cylinders" msgstr " a canviar el nombre de cilindres alternatius" #. sun -#: fdisk/fdisk.c:385 fdisk/fdisk.c:403 fdisk/fdisk.c:419 fdisk/fdisk.c:435 +#: fdisk/fdisk.c:399 fdisk/fdisk.c:417 fdisk/fdisk.c:433 fdisk/fdisk.c:449 msgid " c change number of cylinders" msgstr " c canviar el nombre de cilindres" -#: fdisk/fdisk.c:386 fdisk/fdisk.c:404 fdisk/fdisk.c:420 fdisk/fdisk.c:436 +#: fdisk/fdisk.c:400 fdisk/fdisk.c:418 fdisk/fdisk.c:434 fdisk/fdisk.c:450 msgid " d print the raw data in the partition table" msgstr " d imprimir les dades en cru en la taula de particions" -#: fdisk/fdisk.c:387 +#: fdisk/fdisk.c:401 msgid " e change number of extra sectors per cylinder" msgstr " e canviar el nombre de sectors addicionals per cilindre" #. sun -#: fdisk/fdisk.c:388 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:440 +#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:437 fdisk/fdisk.c:454 msgid " h change number of heads" msgstr " h canviar el nombre de capçals" -#: fdisk/fdisk.c:389 +#: fdisk/fdisk.c:403 msgid " i change interleave factor" msgstr " i canviar factor d'inter-fullatge" #. sun -#: fdisk/fdisk.c:390 +#: fdisk/fdisk.c:404 msgid " o change rotation speed (rpm)" msgstr " o canviar velocitat de rotació (r.p.m.)" -#: fdisk/fdisk.c:394 fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:444 +#: fdisk/fdisk.c:408 fdisk/fdisk.c:425 fdisk/fdisk.c:441 fdisk/fdisk.c:458 #: fdisk/fdiskbsdlabel.c:138 msgid " r return to main menu" msgstr " r tornar al menú principal" -#: fdisk/fdisk.c:395 fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:445 +#: fdisk/fdisk.c:409 fdisk/fdisk.c:426 fdisk/fdisk.c:442 fdisk/fdisk.c:459 msgid " s change number of sectors/track" msgstr " s canviar el nombre de sectors per pista" -#: fdisk/fdisk.c:398 +#: fdisk/fdisk.c:412 msgid " y change number of physical cylinders" msgstr " y canviar el nombre de cilindres físics" -#: fdisk/fdisk.c:402 fdisk/fdisk.c:418 fdisk/fdisk.c:434 +#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:448 msgid " b move beginning of data in a partition" msgstr " b desplaçar al començament les dades d'una partició" -#: fdisk/fdisk.c:405 fdisk/fdisk.c:421 fdisk/fdisk.c:437 +#: fdisk/fdisk.c:419 fdisk/fdisk.c:435 fdisk/fdisk.c:451 msgid " e list extended partitions" msgstr " e llistar particions esteses" #. !sun -#: fdisk/fdisk.c:406 fdisk/fdisk.c:422 fdisk/fdisk.c:439 +#: fdisk/fdisk.c:420 fdisk/fdisk.c:436 fdisk/fdisk.c:453 msgid " g create an IRIX (SGI) partition table" msgstr " g crear una taula de particions IRIX (SGI)" #. !sun -#: fdisk/fdisk.c:438 +#: fdisk/fdisk.c:452 msgid " f fix partition order" msgstr " f fixar un ordre de particions" -#: fdisk/fdisk.c:556 +#: fdisk/fdisk.c:570 msgid "You must set" msgstr "Heu de definir els" -#: fdisk/fdisk.c:570 +#: fdisk/fdisk.c:584 msgid "heads" msgstr "capçals" -#: fdisk/fdisk.c:572 fdisk/fdisk.c:1241 fdisk/sfdisk.c:933 +#: fdisk/fdisk.c:586 fdisk/fdisk.c:1255 fdisk/sfdisk.c:936 msgid "sectors" msgstr "sectors" -#: fdisk/fdisk.c:574 fdisk/fdisk.c:1241 fdisk/fdiskbsdlabel.c:470 -#: fdisk/sfdisk.c:933 +#: fdisk/fdisk.c:588 fdisk/fdisk.c:1255 fdisk/fdiskbsdlabel.c:470 +#: fdisk/sfdisk.c:936 msgid "cylinders" msgstr "cilindres" -#: fdisk/fdisk.c:578 +#: fdisk/fdisk.c:592 #, c-format msgid "" "%s%s.\n" @@ -2412,11 +2412,11 @@ msgstr "" "%s%s.\n" "Podeu fer això des del menú de funcions addicionals.\n" -#: fdisk/fdisk.c:579 +#: fdisk/fdisk.c:593 msgid " and " msgstr " y " -#: fdisk/fdisk.c:596 +#: fdisk/fdisk.c:610 #, c-format msgid "" "\n" @@ -2436,27 +2436,27 @@ msgstr "" "2) Arrencar i particionar des d'un altre SO\n" " (p.e., DOS FDISK, OS/2 FDISK)\n" -#: fdisk/fdisk.c:619 +#: fdisk/fdisk.c:633 msgid "Bad offset in primary extended partition\n" msgstr "Desplaçament incorrecte en particions primàries esteses\n" -#: fdisk/fdisk.c:633 -#, c-format -msgid "Warning: deleting partitions after %d\n" +#: fdisk/fdisk.c:647 +#, fuzzy, c-format +msgid "Warning: omitting partitions after %d\n" msgstr "Atenció: S'estan suprimint les particions després de %d\n" -#: fdisk/fdisk.c:650 +#: fdisk/fdisk.c:664 #, c-format msgid "Warning: extra link pointer in partition table %d\n" msgstr "Atenció: Enllaç d'apuntador addicional en la taula de particions %d\n" -#: fdisk/fdisk.c:658 +#: fdisk/fdisk.c:672 #, c-format msgid "Warning: ignoring extra data in partition table %d\n" msgstr "" "Atenció: S'ignoren les dades addicionals en la taula de particions %d\n" -#: fdisk/fdisk.c:703 +#: fdisk/fdisk.c:717 msgid "" "Building a new DOS disklabel. Changes will remain in memory only,\n" "until you decide to write them. After that, of course, the previous\n" @@ -2468,16 +2468,16 @@ msgstr "" "d'aquesta operació, l'anterior contingut no podrà ser recuperat.\n" "\n" -#: fdisk/fdisk.c:747 +#: fdisk/fdisk.c:761 #, c-format msgid "Note: sector size is %d (not %d)\n" msgstr "Nota: La mida del sector és %d (no %d)\n" -#: fdisk/fdisk.c:904 +#: fdisk/fdisk.c:918 msgid "You will not be able to write the partition table.\n" msgstr "No podreu escriure la taula de particions.\n" -#: fdisk/fdisk.c:933 +#: fdisk/fdisk.c:947 msgid "" "This disk has both DOS and BSD magic.\n" "Give the 'b' command to go to BSD mode.\n" @@ -2485,7 +2485,7 @@ msgstr "" "Aquest disc té tanta màgia DOS com BSD.\n" "Empreu el comandament 'b' per anar al mode BSD.\n" -#: fdisk/fdisk.c:943 +#: fdisk/fdisk.c:957 msgid "" "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF " "disklabel\n" @@ -2493,16 +2493,16 @@ msgstr "" "El dispositiu no conté una taula de particions DOS vàlida, així com tampoc " "una etiqueta de disc Sun, SGI o OSF\n" -#: fdisk/fdisk.c:960 +#: fdisk/fdisk.c:974 msgid "Internal error\n" msgstr "Error intern\n" -#: fdisk/fdisk.c:973 +#: fdisk/fdisk.c:987 #, c-format msgid "Ignoring extra extended partition %d\n" msgstr "S'ignorarà la partició estesa addicional %d\n" -#: fdisk/fdisk.c:985 +#: fdisk/fdisk.c:999 #, c-format msgid "" "Warning: invalid flag 0x%04x of partition table %d will be corrected by w" @@ -2511,7 +2511,7 @@ msgstr "" "Atenció: Etiqueta 0x%04x no vàlida de la taula de particions %d serà " "corregida amb w(rite)\n" -#: fdisk/fdisk.c:1007 +#: fdisk/fdisk.c:1021 msgid "" "\n" "got EOF thrice - exiting..\n" @@ -2519,78 +2519,78 @@ msgstr "" "\n" "s'ha aconseguit un EOF tres vegades - sortint...\n" -#: fdisk/fdisk.c:1046 +#: fdisk/fdisk.c:1060 msgid "Hex code (type L to list codes): " msgstr "Codi hex. (escriviu L per a veure la llista de codis): " -#: fdisk/fdisk.c:1086 +#: fdisk/fdisk.c:1100 #, c-format msgid "%s (%u-%u, default %u): " msgstr "%s (%u-%u, valor per defecte %u): " -#: fdisk/fdisk.c:1153 +#: fdisk/fdisk.c:1167 #, c-format msgid "Using default value %u\n" msgstr "Usant el valor per defecte %u\n" -#: fdisk/fdisk.c:1157 +#: fdisk/fdisk.c:1171 msgid "Value out of range.\n" msgstr "El valor està fora del rang.\n" -#: fdisk/fdisk.c:1167 +#: fdisk/fdisk.c:1181 msgid "Partition number" msgstr "Nombre de partició" -#: fdisk/fdisk.c:1178 +#: fdisk/fdisk.c:1192 #, c-format msgid "Warning: partition %d has empty type\n" msgstr "Atenció: La partició %d és del tipus buit\n" -#: fdisk/fdisk.c:1200 fdisk/fdisk.c:1226 +#: fdisk/fdisk.c:1214 fdisk/fdisk.c:1240 #, c-format msgid "Selected partition %d\n" msgstr "S'ha seleccionat la partició %d\n" -#: fdisk/fdisk.c:1203 +#: fdisk/fdisk.c:1217 msgid "No partition is defined yet!\n" msgstr "No hi ha cap partició definida!\n" -#: fdisk/fdisk.c:1229 +#: fdisk/fdisk.c:1243 msgid "All primary partitions have been defined already!\n" msgstr "Ja s'han definit totes les particions primàries!\n" -#: fdisk/fdisk.c:1239 +#: fdisk/fdisk.c:1253 msgid "cylinder" msgstr "cilindre" -#: fdisk/fdisk.c:1239 +#: fdisk/fdisk.c:1253 msgid "sector" msgstr "sector" -#: fdisk/fdisk.c:1248 +#: fdisk/fdisk.c:1262 #, c-format msgid "Changing display/entry units to %s\n" msgstr "Canviant les unitats de visualització/entrada a %s\n" -#: fdisk/fdisk.c:1259 +#: fdisk/fdisk.c:1273 #, c-format msgid "WARNING: Partition %d is an extended partition\n" msgstr "ATENCIÓ: La partició %d és una partició estesa\n" -#: fdisk/fdisk.c:1270 +#: fdisk/fdisk.c:1284 msgid "DOS Compatibility flag is set\n" msgstr "L'etiqueta de compatibilitat amb DOS està establerta\n" -#: fdisk/fdisk.c:1274 +#: fdisk/fdisk.c:1288 msgid "DOS Compatibility flag is not set\n" msgstr "L'etiqueta de compatibilitat amb DOS no està establerta\n" -#: fdisk/fdisk.c:1374 +#: fdisk/fdisk.c:1388 #, c-format msgid "Partition %d does not exist yet!\n" msgstr "La partició %d encara no existeix!\n" -#: fdisk/fdisk.c:1379 +#: fdisk/fdisk.c:1393 msgid "" "Type 0 means free space to many systems\n" "(but not to Linux). Having partitions of\n" @@ -2602,7 +2602,7 @@ msgstr "" "tindre particions del tipus 0. Podeu suprimir-les\n" "amb el comandament `d'.\n" -#: fdisk/fdisk.c:1388 +#: fdisk/fdisk.c:1402 msgid "" "You cannot change a partition into an extended one or vice versa\n" "Delete it first.\n" @@ -2610,7 +2610,7 @@ msgstr "" "No podeu convertir una partició en estesa ni viceversa primer\n" "haureu d'esborrar-la.\n" -#: fdisk/fdisk.c:1397 +#: fdisk/fdisk.c:1411 msgid "" "Consider leaving partition 3 as Whole disk (5),\n" "as SunOS/Solaris expects it and even Linux likes it.\n" @@ -2621,7 +2621,7 @@ msgstr "" "Linux.\n" "\n" -#: fdisk/fdisk.c:1403 +#: fdisk/fdisk.c:1417 msgid "" "Consider leaving partition 9 as volume header (0),\n" "and partition 11 as entire volume (6)as IRIX expects it.\n" @@ -2632,52 +2632,52 @@ msgstr "" "espera.\n" "\n" -#: fdisk/fdisk.c:1416 +#: fdisk/fdisk.c:1430 #, 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:1471 +#: fdisk/fdisk.c:1485 #, 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:1473 fdisk/fdisk.c:1481 fdisk/fdisk.c:1490 fdisk/fdisk.c:1500 +#: fdisk/fdisk.c:1487 fdisk/fdisk.c:1495 fdisk/fdisk.c:1504 fdisk/fdisk.c:1514 #, c-format msgid " phys=(%d, %d, %d) " msgstr " físic=(%d, %d, %d) " -#: fdisk/fdisk.c:1474 fdisk/fdisk.c:1482 +#: fdisk/fdisk.c:1488 fdisk/fdisk.c:1496 #, c-format msgid "logical=(%d, %d, %d)\n" msgstr "lògic=(%d, %d, %d)\n" -#: fdisk/fdisk.c:1479 +#: fdisk/fdisk.c:1493 #, 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:1488 +#: fdisk/fdisk.c:1502 #, 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:1491 +#: fdisk/fdisk.c:1505 #, c-format msgid "should be (%d, %d, 1)\n" msgstr "ha de ser (%d, %d, 1)\n" -#: fdisk/fdisk.c:1497 +#: fdisk/fdisk.c:1511 #, c-format msgid "Partition %i does not end on cylinder boundary.\n" msgstr "La partició %i no acaba en un límit de cilindre.\n" -#: fdisk/fdisk.c:1501 +#: fdisk/fdisk.c:1515 #, c-format msgid "should be (%d, %d, %d)\n" msgstr "ha de ser (%d, %d, %d)\n" -#: fdisk/fdisk.c:1513 +#: fdisk/fdisk.c:1527 #, c-format msgid "" "\n" @@ -2686,7 +2686,7 @@ msgstr "" "\n" "Disc %s: %ld MiB, %lld octets\n" -#: fdisk/fdisk.c:1516 +#: fdisk/fdisk.c:1530 #, c-format msgid "" "\n" @@ -2695,17 +2695,17 @@ msgstr "" "\n" "Disc %s: %ld.%ld GiB, %lld octets\n" -#: fdisk/fdisk.c:1518 +#: fdisk/fdisk.c:1532 #, c-format msgid "%d heads, %d sectors/track, %d cylinders" msgstr "%d capçals, %d sectors/pista, %d cilindres" -#: fdisk/fdisk.c:1521 +#: fdisk/fdisk.c:1535 #, c-format msgid ", total %llu sectors" msgstr ", total %llu sectors" -#: fdisk/fdisk.c:1524 +#: fdisk/fdisk.c:1538 #, c-format msgid "" "Units = %s of %d * %d = %d bytes\n" @@ -2714,7 +2714,7 @@ msgstr "" "Unitats = %s de %d * %d = %d octets\n" "\n" -#: fdisk/fdisk.c:1632 +#: fdisk/fdisk.c:1646 msgid "" "Nothing to do. Ordering is correct already.\n" "\n" @@ -2722,16 +2722,23 @@ msgstr "" "Res a fer. L'ordre és correcte.\n" "\n" -#: fdisk/fdisk.c:1696 +#: fdisk/fdisk.c:1702 +msgid "" +"This doesn't look like a partition table\n" +"Probably you selected the wrong device.\n" +"\n" +msgstr "" + +#: fdisk/fdisk.c:1716 #, c-format msgid "%*s Boot Start End Blocks Id System\n" msgstr "%*s Arrenc. Comença Acaba Blocs Id Sistema\n" -#: fdisk/fdisk.c:1697 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:674 +#: fdisk/fdisk.c:1717 fdisk/fdisksgilabel.c:220 fdisk/fdisksunlabel.c:674 msgid "Device" msgstr "Dispositiu" -#: fdisk/fdisk.c:1734 +#: fdisk/fdisk.c:1754 msgid "" "\n" "Partition table entries are not in disk order\n" @@ -2739,7 +2746,7 @@ msgstr "" "\n" "Les entrades en la taula de particions no estan en ordre al disc\n" -#: fdisk/fdisk.c:1744 +#: fdisk/fdisk.c:1764 #, c-format msgid "" "\n" @@ -2750,92 +2757,92 @@ msgstr "" "Disc %s: %d capçals, %d sectors, %d cilindres\n" "\n" -#: fdisk/fdisk.c:1746 +#: fdisk/fdisk.c:1766 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:1791 +#: fdisk/fdisk.c:1811 #, c-format msgid "Warning: partition %d contains sector 0\n" msgstr "Atenció: La partició %d conté el sector 0\n" -#: fdisk/fdisk.c:1794 +#: fdisk/fdisk.c:1814 #, 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:1797 +#: fdisk/fdisk.c:1817 #, 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:1800 +#: fdisk/fdisk.c:1820 #, 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:1804 +#: fdisk/fdisk.c:1824 #, 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:1836 +#: fdisk/fdisk.c:1856 #, 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:1844 +#: fdisk/fdisk.c:1864 #, 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:1864 +#: fdisk/fdisk.c:1884 #, c-format msgid "Warning: partition %d is empty\n" msgstr "Atenció: La partició %d està buida\n" -#: fdisk/fdisk.c:1869 +#: fdisk/fdisk.c:1889 #, 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:1875 +#: fdisk/fdisk.c:1895 #, fuzzy, c-format msgid "Total allocated sectors %d greater than the maximum %lld\n" msgstr "El total de sectors assignats %d supera el màxim de %d\n" -#: fdisk/fdisk.c:1878 +#: fdisk/fdisk.c:1898 #, fuzzy, c-format msgid "%lld unallocated sectors\n" msgstr "%d sectors no assignats\n" -#: fdisk/fdisk.c:1893 fdisk/fdisksgilabel.c:629 fdisk/fdisksunlabel.c:503 +#: fdisk/fdisk.c:1913 fdisk/fdisksgilabel.c:629 fdisk/fdisksunlabel.c:503 #, 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:1920 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:647 +#: fdisk/fdisk.c:1940 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksgilabel.c:647 #: fdisk/fdisksunlabel.c:518 #, c-format msgid "First %s" msgstr "Primer %s" -#: fdisk/fdisk.c:1935 fdisk/fdisksunlabel.c:559 +#: fdisk/fdisk.c:1955 fdisk/fdisksunlabel.c:559 #, c-format msgid "Sector %d is already allocated\n" msgstr "El sector %d ja està assignat\n" -#: fdisk/fdisk.c:1971 +#: fdisk/fdisk.c:1991 msgid "No free sectors available\n" msgstr "No hi ha cap sector lliure disponible\n" -#: fdisk/fdisk.c:1980 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:570 +#: fdisk/fdisk.c:2000 fdisk/fdiskbsdlabel.c:291 fdisk/fdisksunlabel.c:570 #, c-format msgid "Last %s or +size or +sizeM or +sizeK" msgstr "Últim %s o +mida o +midaM o +midaK" -#: fdisk/fdisk.c:2045 +#: fdisk/fdisk.c:2065 msgid "" "\tSorry - this fdisk cannot handle AIX disk labels.\n" "\tIf you want to add DOS-type partitions, create\n" @@ -2847,25 +2854,25 @@ msgstr "" "\t particions DOS (Useu o).\n" "\tATENCIÓ: Això destruirà l'actual contingut del disc.\n" -#: fdisk/fdisk.c:2057 fdisk/fdiskbsdlabel.c:618 +#: fdisk/fdisk.c:2077 fdisk/fdiskbsdlabel.c:618 msgid "The maximum number of partitions has been created\n" msgstr "S'ha creat el màxim nombre de particions\n" -#: fdisk/fdisk.c:2065 +#: fdisk/fdisk.c:2085 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:2068 +#: fdisk/fdisk.c:2088 #, fuzzy msgid "All logical partitions are in use\n" msgstr "les particions lògiques no estan en un ordre de disc" -#: fdisk/fdisk.c:2069 +#: fdisk/fdisk.c:2089 #, fuzzy msgid "Adding a primary partition\n" msgstr "Partició primària incorrecta" -#: fdisk/fdisk.c:2074 +#: fdisk/fdisk.c:2094 #, c-format msgid "" "Command action\n" @@ -2876,20 +2883,20 @@ msgstr "" "%s\n" " p Partició primària (1-4)\n" -#: fdisk/fdisk.c:2076 +#: fdisk/fdisk.c:2096 msgid "l logical (5 or over)" msgstr "l lògica (5 o superior)" -#: fdisk/fdisk.c:2076 +#: fdisk/fdisk.c:2096 msgid "e extended" msgstr "e estesa" -#: fdisk/fdisk.c:2095 +#: fdisk/fdisk.c:2115 #, c-format msgid "Invalid partition number for type `%c'\n" msgstr "Nombre de partició no vàlid per al tipus `%c'\n" -#: fdisk/fdisk.c:2131 +#: fdisk/fdisk.c:2151 msgid "" "The partition table has been altered!\n" "\n" @@ -2897,11 +2904,11 @@ msgstr "" "Ja s'ha modificat la taula de particions!\n" "\n" -#: fdisk/fdisk.c:2140 +#: fdisk/fdisk.c:2160 msgid "Calling ioctl() to re-read partition table.\n" msgstr "Cridant a ioctl() per a rellegir la taula de particions.\n" -#: fdisk/fdisk.c:2156 +#: fdisk/fdisk.c:2176 #, c-format msgid "" "\n" @@ -2914,7 +2921,7 @@ msgstr "" "El nucli encara usa l'antiga taula.\n" "La taula nova s'usarà després de reiniciar.\n" -#: fdisk/fdisk.c:2166 +#: fdisk/fdisk.c:2186 msgid "" "\n" "WARNING: If you have created or modified any DOS 6.x\n" @@ -2926,67 +2933,67 @@ msgstr "" "particions DOS 6.x, mireu la pàgina del manual del fdisk\n" "per a informació addicional.\n" -#: fdisk/fdisk.c:2173 +#: fdisk/fdisk.c:2193 msgid "Syncing disks.\n" msgstr "Sincronitzant els discs.\n" -#: fdisk/fdisk.c:2220 +#: fdisk/fdisk.c:2240 #, c-format msgid "Partition %d has no data area\n" msgstr "La partició %d no té cap àrea amb dades\n" -#: fdisk/fdisk.c:2225 +#: fdisk/fdisk.c:2245 msgid "New beginning of data" msgstr "Nou començament de dades" -#: fdisk/fdisk.c:2241 +#: fdisk/fdisk.c:2261 msgid "Expert command (m for help): " msgstr "Comandament expert (m per a l'ajuda): " -#: fdisk/fdisk.c:2254 +#: fdisk/fdisk.c:2274 msgid "Number of cylinders" msgstr "Nombre de cilindres" -#: fdisk/fdisk.c:2281 +#: fdisk/fdisk.c:2301 msgid "Number of heads" msgstr "Nombre de capçals" -#: fdisk/fdisk.c:2306 +#: fdisk/fdisk.c:2326 msgid "Number of sectors" msgstr "Nombre de sectors" -#: fdisk/fdisk.c:2309 +#: fdisk/fdisk.c:2329 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:2381 +#: fdisk/fdisk.c:2401 #, 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:2392 +#: fdisk/fdisk.c:2412 #, c-format msgid "Cannot open %s\n" msgstr "No es pot obrir %s\n" -#: fdisk/fdisk.c:2410 fdisk/sfdisk.c:2449 +#: fdisk/fdisk.c:2430 fdisk/sfdisk.c:2452 #, c-format msgid "cannot open %s\n" msgstr "no es pot obrir %s\n" -#: fdisk/fdisk.c:2430 +#: fdisk/fdisk.c:2450 #, c-format msgid "%c: unknown command\n" msgstr "%c: Comandament desconegut\n" -#: fdisk/fdisk.c:2498 +#: fdisk/fdisk.c:2518 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:2502 +#: fdisk/fdisk.c:2522 msgid "" "Warning: the -b (set sector size) option should be used with one specified " "device\n" @@ -2995,18 +3002,18 @@ msgstr "" "dispositiu específic\n" #. OSF label, and no DOS label -#: fdisk/fdisk.c:2561 +#: fdisk/fdisk.c:2581 #, 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:2571 +#: fdisk/fdisk.c:2591 msgid "Command (m for help): " msgstr "Comandament (m per a l'ajuda): " -#: fdisk/fdisk.c:2587 +#: fdisk/fdisk.c:2607 #, c-format msgid "" "\n" @@ -3015,15 +3022,15 @@ msgstr "" "\n" "L'actual fitxer d'arrencada és: %s\n" -#: fdisk/fdisk.c:2589 +#: fdisk/fdisk.c:2609 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:2591 +#: fdisk/fdisk.c:2611 msgid "Boot file unchanged\n" msgstr "No s'ha modificat el fitxer d'arrencada\n" -#: fdisk/fdisk.c:2664 +#: fdisk/fdisk.c:2684 msgid "" "\n" "\tSorry, no experts menu for SGI partition tables available.\n" @@ -3737,7 +3744,7 @@ msgid "SunOS home" msgstr "SunOS home" #. DOS 3.3+ secondary -#: fdisk/fdisksunlabel.c:56 fdisk/i386_sys_types.c:98 +#: fdisk/fdisksunlabel.c:56 fdisk/i386_sys_types.c:99 msgid "Linux raid autodetect" msgstr "Autodetecció Linux raid" @@ -4106,8 +4113,8 @@ msgid "Priam Edisk" msgstr "Priam Edisk" #. DOS R/O or SpeedStor -#: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:89 -#: fdisk/i386_sys_types.c:95 fdisk/i386_sys_types.c:96 +#: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:90 +#: fdisk/i386_sys_types.c:96 fdisk/i386_sys_types.c:97 msgid "SpeedStor" msgstr "SpeedStor" @@ -4219,85 +4226,90 @@ msgid "Solaris boot" msgstr "Arrencada Solaris" #: fdisk/i386_sys_types.c:77 +#, fuzzy +msgid "Solaris" +msgstr "Arrencada Solaris" + +#: fdisk/i386_sys_types.c:78 msgid "DRDOS/sec (FAT-12)" msgstr "DRDOS/sec (FAT-12)" -#: fdisk/i386_sys_types.c:78 +#: fdisk/i386_sys_types.c:79 msgid "DRDOS/sec (FAT-16 < 32M)" msgstr "DRDOS/sec (FAT-16 < 32M)" -#: fdisk/i386_sys_types.c:79 +#: fdisk/i386_sys_types.c:80 msgid "DRDOS/sec (FAT-16)" msgstr "DRDOS/sec (FAT-16)" -#: fdisk/i386_sys_types.c:80 +#: fdisk/i386_sys_types.c:81 msgid "Syrinx" msgstr "Syrinx" -#: fdisk/i386_sys_types.c:81 +#: fdisk/i386_sys_types.c:82 msgid "Non-FS data" msgstr "Dades sense S.F." -#: fdisk/i386_sys_types.c:82 +#: fdisk/i386_sys_types.c:83 msgid "CP/M / CTOS / ..." msgstr "CP/M / CTOS / ..." #. CP/M or Concurrent CP/M or #. Concurrent DOS or CTOS -#: fdisk/i386_sys_types.c:84 +#: fdisk/i386_sys_types.c:85 msgid "Dell Utility" msgstr "Utilitat Dell" #. Dell PowerEdge Server utilities -#: fdisk/i386_sys_types.c:85 +#: fdisk/i386_sys_types.c:86 msgid "BootIt" msgstr "BootIt" #. BootIt EMBRM -#: fdisk/i386_sys_types.c:86 +#: fdisk/i386_sys_types.c:87 msgid "DOS access" msgstr "Accés DOS" #. DOS access or SpeedStor 12-bit FAT #. extended partition -#: fdisk/i386_sys_types.c:88 +#: fdisk/i386_sys_types.c:89 msgid "DOS R/O" msgstr "DOS R/O" #. SpeedStor 16-bit FAT extended #. partition < 1024 cyl. -#: fdisk/i386_sys_types.c:91 +#: fdisk/i386_sys_types.c:92 msgid "BeOS fs" msgstr "Sis. Fitx. BeOS" -#: fdisk/i386_sys_types.c:92 +#: fdisk/i386_sys_types.c:93 msgid "EFI GPT" msgstr "EFI GPT" #. Intel EFI GUID Partition Table -#: fdisk/i386_sys_types.c:93 +#: fdisk/i386_sys_types.c:94 msgid "EFI (FAT-12/16/32)" msgstr "EFI (FAT-12/16/32)" #. Intel EFI System Partition -#: fdisk/i386_sys_types.c:94 +#: fdisk/i386_sys_types.c:95 msgid "Linux/PA-RISC boot" msgstr "Arrencada Linux/PA-RISC" #. SpeedStor large partition -#: fdisk/i386_sys_types.c:97 +#: fdisk/i386_sys_types.c:98 msgid "DOS secondary" msgstr "Secundària DOS" #. New (2.2.x) raid partition with #. autodetect using persistent #. superblock -#: fdisk/i386_sys_types.c:101 +#: fdisk/i386_sys_types.c:102 msgid "LANstep" msgstr "LANstep" #. SpeedStor >1024 cyl. or LANstep -#: fdisk/i386_sys_types.c:102 +#: fdisk/i386_sys_types.c:103 msgid "BBT" msgstr "BBT" @@ -4463,11 +4475,11 @@ msgstr "" "Id Nom\n" "\n" -#: fdisk/sfdisk.c:810 +#: fdisk/sfdisk.c:813 msgid "Re-reading the partition table ...\n" msgstr "Rellegint la taula de particions...\n" -#: fdisk/sfdisk.c:816 +#: fdisk/sfdisk.c:819 msgid "" "The command to re-read the partition table failed\n" "Reboot your system now, before using mkfs\n" @@ -4475,31 +4487,31 @@ msgstr "" "El comandament per a rellegir la taula de particions ha fallat\n" "Reinicieu el sistema ara, avans d'usar mkfs\n" -#: fdisk/sfdisk.c:821 +#: fdisk/sfdisk.c:824 #, c-format msgid "Error closing %s\n" msgstr "Error tancant %s\n" -#: fdisk/sfdisk.c:859 +#: fdisk/sfdisk.c:862 #, c-format msgid "%s: no such partition\n" msgstr "%s: Aquesta partició no existeix\n" -#: fdisk/sfdisk.c:882 +#: fdisk/sfdisk.c:885 msgid "unrecognized format - using sectors\n" msgstr "Format no reconegut; usant els sectors\n" -#: fdisk/sfdisk.c:921 +#: fdisk/sfdisk.c:924 #, c-format msgid "# partition table of %s\n" msgstr "# taula de particions de %s\n" -#: fdisk/sfdisk.c:932 +#: fdisk/sfdisk.c:935 #, c-format msgid "unimplemented format - using %s\n" msgstr "format no implementat; usant %s\n" -#: fdisk/sfdisk.c:936 +#: fdisk/sfdisk.c:939 #, c-format msgid "" "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n" @@ -4508,11 +4520,11 @@ msgstr "" "Unitats = cilindres de %lu octets, blocs de 1024 octets, contant des de %d\n" "\n" -#: fdisk/sfdisk.c:939 +#: fdisk/sfdisk.c:942 msgid " Device Boot Start End #cyls #blocks Id System\n" msgstr " Disp. Arr. Comença Acaba #cil. #blocs Id Sistema\n" -#: fdisk/sfdisk.c:944 +#: fdisk/sfdisk.c:947 #, c-format msgid "" "Units = sectors of 512 bytes, counting from %d\n" @@ -4521,11 +4533,11 @@ msgstr "" "Unitats = sectors de 512 octets, contant des de %d\n" "\n" -#: fdisk/sfdisk.c:946 +#: fdisk/sfdisk.c:949 msgid " Device Boot Start End #sectors Id System\n" msgstr " Disp. Arr Comença Acaba #sectors Id Sistema\n" -#: fdisk/sfdisk.c:949 +#: fdisk/sfdisk.c:952 #, c-format msgid "" "Units = blocks of 1024 bytes, counting from %d\n" @@ -4534,11 +4546,11 @@ msgstr "" "Unitats = blocs de 1024 octets, contant des de %d\n" "\n" -#: fdisk/sfdisk.c:951 +#: fdisk/sfdisk.c:954 msgid " Device Boot Start End #blocks Id System\n" msgstr " Disp. Arr. Comença Acaba #blocs Id Sistema\n" -#: fdisk/sfdisk.c:954 +#: fdisk/sfdisk.c:957 #, c-format msgid "" "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n" @@ -4547,33 +4559,33 @@ msgstr "" "Unitats = MiB de 1048576 octets, blocs de 1024 octets, comptant des de %d\n" "\n" -#: fdisk/sfdisk.c:956 +#: fdisk/sfdisk.c:959 msgid " Device Boot Start End MiB #blocks Id System\n" msgstr " Disp. Arr. Comen. Acaba MB #blocs Id Sistema\n" -#: fdisk/sfdisk.c:1116 +#: fdisk/sfdisk.c:1119 #, c-format msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n" msgstr "" "\t\tcomença: (cil.,capç.,sect.) esperat (%ld,%ld,%ld) trobat (%ld,%ld,%ld)\n" -#: fdisk/sfdisk.c:1123 +#: fdisk/sfdisk.c:1126 #, c-format msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n" msgstr "" "\t\tacaba: (cil.,capç.,sect.) esperat (%ld,%ld,%ld) trobat (%ld,%ld,%ld)\n" -#: fdisk/sfdisk.c:1126 +#: fdisk/sfdisk.c:1129 #, c-format msgid "partition ends on cylinder %ld, beyond the end of the disk\n" msgstr "" "la partició cava en el cilindre %ld, més enllà de l'acabament del disc\n" -#: fdisk/sfdisk.c:1136 +#: fdisk/sfdisk.c:1139 msgid "No partitions found\n" msgstr "No s'han trobat particions\n" -#: fdisk/sfdisk.c:1140 +#: fdisk/sfdisk.c:1143 #, c-format msgid "" "Warning: The partition table looks like it was made\n" @@ -4584,52 +4596,52 @@ msgstr "" " per a Cil./Capç./Sect.=*/%ld/%ld (en comptes de %ld/%ld/%ld).\n" "Per a aquest llistat s'assumirà aquesta geometria.\n" -#: fdisk/sfdisk.c:1189 +#: fdisk/sfdisk.c:1192 msgid "no partition table present.\n" msgstr "no hi ha cap taula de particions.\n" -#: fdisk/sfdisk.c:1191 +#: fdisk/sfdisk.c:1194 #, c-format msgid "strange, only %d partitions defined.\n" msgstr "estranyament, sols hi han definides %d particions.\n" -#: fdisk/sfdisk.c:1200 +#: fdisk/sfdisk.c:1203 #, c-format msgid "Warning: partition %s has size 0 but is not marked Empty\n" msgstr "" "Atenció: La partició %s té una mida 0 però no està marcada com a buida\n" -#: fdisk/sfdisk.c:1203 +#: fdisk/sfdisk.c:1206 #, c-format msgid "Warning: partition %s has size 0 and is bootable\n" msgstr "Atenció: La partició %s té una mida 0 i és d'arrencada\n" -#: fdisk/sfdisk.c:1206 +#: fdisk/sfdisk.c:1209 #, c-format msgid "Warning: partition %s has size 0 and nonzero start\n" msgstr "Atenció: La partició %s té una mida 0 i no comença en el zero\n" -#: fdisk/sfdisk.c:1217 +#: fdisk/sfdisk.c:1220 #, c-format msgid "Warning: partition %s " msgstr "Atenció: La partició %s " -#: fdisk/sfdisk.c:1218 +#: fdisk/sfdisk.c:1221 #, c-format msgid "is not contained in partition %s\n" msgstr "no està contingut a dins de la partició %s\n" -#: fdisk/sfdisk.c:1229 +#: fdisk/sfdisk.c:1232 #, c-format msgid "Warning: partitions %s " msgstr "Atenció: Les particions %s " -#: fdisk/sfdisk.c:1230 +#: fdisk/sfdisk.c:1233 #, c-format msgid "and %s overlap\n" msgstr "i %s es solapen\n" -#: fdisk/sfdisk.c:1241 +#: fdisk/sfdisk.c:1244 #, c-format msgid "" "Warning: partition %s contains part of the partition table (sector %lu),\n" @@ -4638,17 +4650,17 @@ msgstr "" "Atenció: La partició %s conté part de la taula de particions\n" "(sector %lu) i la destruirà en quant s'ompli\n" -#: fdisk/sfdisk.c:1253 +#: fdisk/sfdisk.c:1256 #, c-format msgid "Warning: partition %s starts at sector 0\n" msgstr "Atenció: La partició %s comença en el sector 0\n" -#: fdisk/sfdisk.c:1257 +#: fdisk/sfdisk.c:1260 #, c-format msgid "Warning: partition %s extends past end of disk\n" msgstr "Atenció: La partició %s acaba més enllà de l'acabament del disc\n" -#: fdisk/sfdisk.c:1272 +#: fdisk/sfdisk.c:1275 msgid "" "Among the primary partitions, at most one can be extended\n" " (although this is not a problem under Linux)\n" @@ -4656,17 +4668,17 @@ msgstr "" "Entre les particions primàries, almenys una pot ser estesa\n" " (encara que això no és un problema sota Linux)\n" -#: fdisk/sfdisk.c:1290 +#: fdisk/sfdisk.c:1293 #, c-format msgid "Warning: partition %s does not start at a cylinder boundary\n" msgstr "Atenció: La partició %s no comença en al límit d'un cilindre\n" -#: fdisk/sfdisk.c:1296 +#: fdisk/sfdisk.c:1299 #, c-format msgid "Warning: partition %s does not end at a cylinder boundary\n" msgstr "Atenció: La partició %s no acaba al límit d'un cilindre\n" -#: fdisk/sfdisk.c:1314 +#: fdisk/sfdisk.c:1317 msgid "" "Warning: more than one primary partition is marked bootable (active)\n" "This does not matter for LILO, but the DOS MBR will not boot this disk.\n" @@ -4675,7 +4687,7 @@ msgstr "" "Això no és problema per al LILO, però el MBR del DOS no arrencarà aquest " "disc.\n" -#: fdisk/sfdisk.c:1321 +#: fdisk/sfdisk.c:1324 msgid "" "Warning: usually one can boot from primary partitions only\n" "LILO disregards the `bootable' flag.\n" @@ -4683,7 +4695,7 @@ msgstr "" "Atenció: Usualment sols es pot arrencar des de particions primàries.\n" "El LILO no tindrà en compte l'etiqueta `d'arrencada'.\n" -#: fdisk/sfdisk.c:1327 +#: fdisk/sfdisk.c:1330 msgid "" "Warning: no primary partition is marked bootable (active)\n" "This does not matter for LILO, but the DOS MBR will not boot this disk.\n" @@ -4692,11 +4704,11 @@ msgstr "" "Això no és problema per al LILO, però el MBR de DOS no arrencarà aquest " "disc.\n" -#: fdisk/sfdisk.c:1341 +#: fdisk/sfdisk.c:1344 msgid "start" msgstr "començament" -#: fdisk/sfdisk.c:1344 +#: fdisk/sfdisk.c:1347 #, c-format msgid "" "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n" @@ -4704,24 +4716,24 @@ msgstr "" "partició %s: Començament: (cil.,capç.,sect.) s'esperava (%ld,%ld,%ld) s'ha " "trobat (%ld,%ld,%ld)\n" -#: fdisk/sfdisk.c:1350 +#: fdisk/sfdisk.c:1353 msgid "end" msgstr "acaba" -#: fdisk/sfdisk.c:1353 +#: fdisk/sfdisk.c:1356 #, c-format msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n" msgstr "" "partició %s: Acaba: (cil.,capç.,sect.) s'esperava (%ld,%ld,%ld) s'ha trovat " "(%ld,%ld,%ld)\n" -#: fdisk/sfdisk.c:1356 +#: fdisk/sfdisk.c:1359 #, c-format msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n" msgstr "" "La partició %s acaba en el cilindre %ld, més enllà de l'acabament del disc\n" -#: fdisk/sfdisk.c:1381 +#: fdisk/sfdisk.c:1384 #, c-format msgid "" "Warning: shifted start of the extd partition from %ld to %ld\n" @@ -4730,7 +4742,7 @@ msgstr "" "Atenció: Es desplaça el començament de la partició estesa de %ld a %ld\n" "(Sols amb el propòsit de llistar-la. No es canviarà el seu contingut).\n" -#: fdisk/sfdisk.c:1387 +#: fdisk/sfdisk.c:1390 msgid "" "Warning: extended partition does not start at a cylinder boundary.\n" "DOS and Linux will interpret the contents differently.\n" @@ -4739,133 +4751,133 @@ msgstr "" "El DOS i Linux interpretaran el contingut d'un mode diferent.\n" "\n" -#: fdisk/sfdisk.c:1405 fdisk/sfdisk.c:1482 +#: fdisk/sfdisk.c:1408 fdisk/sfdisk.c:1485 #, c-format msgid "too many partitions - ignoring those past nr (%d)\n" msgstr "masses particions - s'ignoran les anteriors al núm: (%d)\n" -#: fdisk/sfdisk.c:1420 +#: fdisk/sfdisk.c:1423 msgid "tree of partitions?\n" msgstr "l'arbre de particions?\n" -#: fdisk/sfdisk.c:1541 +#: fdisk/sfdisk.c:1544 msgid "detected Disk Manager - unable to handle that\n" msgstr "detectat Gestor de Disc - no es pot tractar això\n" -#: fdisk/sfdisk.c:1548 +#: fdisk/sfdisk.c:1551 msgid "DM6 signature found - giving up\n" msgstr "signatura DM6 trobada - abandonant\n" -#: fdisk/sfdisk.c:1568 +#: fdisk/sfdisk.c:1571 msgid "strange..., an extended partition of size 0?\n" msgstr "estrany..., una partició estesa de mida 0?\n" -#: fdisk/sfdisk.c:1575 fdisk/sfdisk.c:1586 +#: fdisk/sfdisk.c:1578 fdisk/sfdisk.c:1589 msgid "strange..., a BSD partition of size 0?\n" msgstr "estrany..., una partició BSD de mida 0?\n" -#: fdisk/sfdisk.c:1620 +#: fdisk/sfdisk.c:1623 #, fuzzy, c-format msgid " %s: unrecognized partition table type\n" msgstr " %s: Partició no reconeguda\n" -#: fdisk/sfdisk.c:1632 +#: fdisk/sfdisk.c:1635 msgid "-n flag was given: Nothing changed\n" msgstr "s'ha especificat l'etiqueta -n: No s'ha canviat res\n" -#: fdisk/sfdisk.c:1648 +#: fdisk/sfdisk.c:1651 msgid "Failed saving the old sectors - aborting\n" msgstr "Falla al desar els antics sectors - avortant\n" -#: fdisk/sfdisk.c:1653 +#: fdisk/sfdisk.c:1656 #, c-format msgid "Failed writing the partition on %s\n" msgstr "Falla a l'escriure la partició en %s\n" -#: fdisk/sfdisk.c:1730 +#: fdisk/sfdisk.c:1733 msgid "long or incomplete input line - quitting\n" msgstr "línia d'entrada llarga o incompleta - abandonant\n" -#: fdisk/sfdisk.c:1766 +#: fdisk/sfdisk.c:1769 #, c-format msgid "input error: `=' expected after %s field\n" msgstr "error d'entrada: S'esperava `=' després del camp %s\n" -#: fdisk/sfdisk.c:1773 +#: fdisk/sfdisk.c:1776 #, c-format msgid "input error: unexpected character %c after %s field\n" msgstr "error d'entrada: Caràcter inesperat %c després del camp %s\n" -#: fdisk/sfdisk.c:1779 +#: fdisk/sfdisk.c:1782 #, c-format msgid "unrecognized input: %s\n" msgstr "entrada desconeguda: %s\n" -#: fdisk/sfdisk.c:1821 +#: fdisk/sfdisk.c:1824 msgid "number too big\n" msgstr "número massa gran\n" -#: fdisk/sfdisk.c:1825 +#: fdisk/sfdisk.c:1828 msgid "trailing junk after number\n" msgstr "dades estranyes després del número\n" -#: fdisk/sfdisk.c:1948 +#: fdisk/sfdisk.c:1951 msgid "no room for partition descriptor\n" msgstr "no hi ha espai per al descriptor de partició\n" -#: fdisk/sfdisk.c:1981 +#: fdisk/sfdisk.c:1984 msgid "cannot build surrounding extended partition\n" msgstr "no es pot crear una partició estesa adjunta\n" -#: fdisk/sfdisk.c:2032 +#: fdisk/sfdisk.c:2035 msgid "too many input fields\n" msgstr "masses camps a l'entrada\n" #. no free blocks left - don't read any further -#: fdisk/sfdisk.c:2066 +#: fdisk/sfdisk.c:2069 msgid "No room for more\n" msgstr "No queda més espai\n" -#: fdisk/sfdisk.c:2085 +#: fdisk/sfdisk.c:2088 msgid "Illegal type\n" msgstr "Tipus no permés\n" -#: fdisk/sfdisk.c:2117 +#: fdisk/sfdisk.c:2120 #, c-format msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n" msgstr "" "Atenció: La mida aconseguida (%lu) excedeix la màxima acceptable de (%lu)\n" -#: fdisk/sfdisk.c:2123 +#: fdisk/sfdisk.c:2126 msgid "Warning: empty partition\n" msgstr "Atenció: Partició buida\n" -#: fdisk/sfdisk.c:2137 +#: fdisk/sfdisk.c:2140 #, c-format msgid "Warning: bad partition start (earliest %lu)\n" msgstr "Atenció: Començament de la partició incorrecte (abans %lu)\n" -#: fdisk/sfdisk.c:2150 +#: fdisk/sfdisk.c:2153 msgid "unrecognized bootable flag - choose - or *\n" msgstr "Etiqueta d'arrencada desconeguda - escolliu - o *\n" -#: fdisk/sfdisk.c:2167 fdisk/sfdisk.c:2180 +#: fdisk/sfdisk.c:2170 fdisk/sfdisk.c:2183 msgid "partial c,h,s specification?\n" msgstr "especificació parcial de cil,capç,sect?\n" -#: fdisk/sfdisk.c:2191 +#: fdisk/sfdisk.c:2194 msgid "Extended partition not where expected\n" msgstr "Partició estesa a on no s'esperava\n" -#: fdisk/sfdisk.c:2223 +#: fdisk/sfdisk.c:2226 msgid "bad input\n" msgstr "entrada dolenta\n" -#: fdisk/sfdisk.c:2245 +#: fdisk/sfdisk.c:2248 msgid "too many partitions\n" msgstr "masses particions\n" -#: fdisk/sfdisk.c:2278 +#: fdisk/sfdisk.c:2281 msgid "" "Input in the following format; absent fields get a default value.\n" " \n" @@ -4877,48 +4889,48 @@ msgstr "" "Normalment sols necessitarieu especificar i (i potser " ").\n" -#: fdisk/sfdisk.c:2298 +#: fdisk/sfdisk.c:2301 msgid "version" msgstr "versió" -#: fdisk/sfdisk.c:2304 +#: fdisk/sfdisk.c:2307 #, c-format msgid "Usage: %s [options] device ...\n" msgstr "Ús: %s [opcions] dispositiu ...\n" -#: fdisk/sfdisk.c:2305 +#: fdisk/sfdisk.c:2308 msgid "device: something like /dev/hda or /dev/sda" msgstr "dispositiu: Semblant a /dev/hda o /dev/sda" -#: fdisk/sfdisk.c:2306 +#: fdisk/sfdisk.c:2309 msgid "useful options:" msgstr "opcions útils:" -#: fdisk/sfdisk.c:2307 +#: fdisk/sfdisk.c:2310 msgid " -s [or --show-size]: list size of a partition" msgstr " -s [o --show-size]: Mostra la mida d'una partició" -#: fdisk/sfdisk.c:2308 +#: fdisk/sfdisk.c:2311 msgid " -c [or --id]: print or change partition Id" msgstr "" " -c [o --id]: Imprimeix o canvia l'identificador de la partició" -#: fdisk/sfdisk.c:2309 +#: fdisk/sfdisk.c:2312 msgid " -l [or --list]: list partitions of each device" msgstr " -l [o --list]: Mostra les particions de cada dispositiu" -#: fdisk/sfdisk.c:2310 +#: fdisk/sfdisk.c:2313 msgid " -d [or --dump]: idem, but in a format suitable for later input" msgstr "" " -d [o --dump]: Igual, però amb un format adequat per l'entrada " "posterior" -#: fdisk/sfdisk.c:2311 +#: fdisk/sfdisk.c:2314 msgid " -i [or --increment]: number cylinders etc. from 1 instead of from 0" msgstr "" " -i [o --increment]: Nombre de cilindres, etc. des de 1 en comptes de 0" -#: fdisk/sfdisk.c:2312 +#: fdisk/sfdisk.c:2315 msgid "" " -uS, -uB, -uC, -uM: accept/report in units of sectors/blocks/cylinders/" "MB" @@ -4926,56 +4938,56 @@ msgstr "" " -uS, -uB, -uC, -uM: Accepta/reporta en unitats de sectors/blocs/" "cilindres/MB" -#: fdisk/sfdisk.c:2313 +#: fdisk/sfdisk.c:2316 msgid " -T [or --list-types]:list the known partition types" msgstr " -T [o --list-types]: Llista els tipus de particions conegudes" -#: fdisk/sfdisk.c:2314 +#: fdisk/sfdisk.c:2317 msgid " -D [or --DOS]: for DOS-compatibility: waste a little space" msgstr "" " -D [o --DOS]: Per compatibilitat amb DOS: Es perd una mica d'espai" -#: fdisk/sfdisk.c:2315 +#: fdisk/sfdisk.c:2318 msgid " -R [or --re-read]: make kernel reread partition table" msgstr "" " -R [o --re-read]: Fa que el nucli rellegeixi la taula de particions" -#: fdisk/sfdisk.c:2316 +#: fdisk/sfdisk.c:2319 msgid " -N# : change only the partition with number #" msgstr " -N# : Sols canvia la partició amb el número #" -#: fdisk/sfdisk.c:2317 +#: fdisk/sfdisk.c:2320 msgid " -n : do not actually write to disk" msgstr " -n : No escriu realment al disc" -#: fdisk/sfdisk.c:2318 +#: fdisk/sfdisk.c:2321 msgid "" " -O file : save the sectors that will be overwritten to file" msgstr "" " -O fitxer : Desa els sectors que es sobreescriuran en un fitxer" -#: fdisk/sfdisk.c:2319 +#: fdisk/sfdisk.c:2322 msgid " -I file : restore these sectors again" msgstr " -I fitxer: Restaura aquests sectors altra vegada" -#: fdisk/sfdisk.c:2320 +#: fdisk/sfdisk.c:2323 msgid " -v [or --version]: print version" msgstr " -v [o --version]: Imprimeix la versió" -#: fdisk/sfdisk.c:2321 +#: fdisk/sfdisk.c:2324 msgid " -? [or --help]: print this message" msgstr " -? [o --help]: Imprimeix aquest missatge" -#: fdisk/sfdisk.c:2322 +#: fdisk/sfdisk.c:2325 msgid "dangerous options:" msgstr "opcions perilloses:" -#: fdisk/sfdisk.c:2323 +#: fdisk/sfdisk.c:2326 msgid " -g [or --show-geometry]: print the kernel's idea of the geometry" msgstr "" " -g [o --show-geometry]: Imprimeix la idea del nucli de la geometria" -#: fdisk/sfdisk.c:2324 +#: fdisk/sfdisk.c:2327 msgid "" " -x [or --show-extended]: also list extended partitions on output\n" " or expect descriptors for them on input" @@ -4984,119 +4996,119 @@ msgstr "" "esteses\n" " o espera els seus descriptors en l'entrada" -#: fdisk/sfdisk.c:2326 +#: fdisk/sfdisk.c:2329 msgid "" " -L [or --Linux]: do not complain about things irrelevant for Linux" msgstr "" " -L [o --Linux]: No mostra avisos sobre aspectes irrellevants per " "a Linux" -#: fdisk/sfdisk.c:2327 +#: fdisk/sfdisk.c:2330 msgid " -q [or --quiet]: suppress warning messages" msgstr " -q [o --quiet]: Suprimeix els missatges d'advertència" -#: fdisk/sfdisk.c:2328 +#: fdisk/sfdisk.c:2331 msgid " You can override the detected geometry using:" msgstr " Podeu modificar la geometria detectada usant:" -#: fdisk/sfdisk.c:2329 +#: fdisk/sfdisk.c:2332 msgid " -C# [or --cylinders #]:set the number of cylinders to use" msgstr "" " -C# [o --cylinders #]: Estableix el nombre de cilindres que s'usaran" -#: fdisk/sfdisk.c:2330 +#: fdisk/sfdisk.c:2333 msgid " -H# [or --heads #]: set the number of heads to use" msgstr " -H# [o --heads #]: Estableix el nombre de capçals que s'usaran" -#: fdisk/sfdisk.c:2331 +#: fdisk/sfdisk.c:2334 msgid " -S# [or --sectors #]: set the number of sectors to use" msgstr " -S# [o --sectors #]: Estableix el nombre de sectors que s'usaran" -#: fdisk/sfdisk.c:2332 +#: fdisk/sfdisk.c:2335 msgid "You can disable all consistency checking with:" msgstr "Podeu desactivar tota comprovació de consistència amb:" -#: fdisk/sfdisk.c:2333 +#: fdisk/sfdisk.c:2336 msgid " -f [or --force]: do what I say, even if it is stupid" msgstr "" " -f [o --force]: Farà el que li digueu, encara que sigui estúpid" -#: fdisk/sfdisk.c:2339 +#: fdisk/sfdisk.c:2342 msgid "Usage:" msgstr "Ús:" -#: fdisk/sfdisk.c:2340 +#: fdisk/sfdisk.c:2343 #, c-format msgid "%s device\t\t list active partitions on device\n" msgstr "%s dispositiu\t\t enumera les particions actives del dispositiu\n" -#: fdisk/sfdisk.c:2341 +#: fdisk/sfdisk.c:2344 #, c-format msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n" msgstr "" "%s dispositiu n1 n2 ... activar particions n1 ..., desactivar la resta\n" -#: fdisk/sfdisk.c:2342 +#: fdisk/sfdisk.c:2345 #, c-format msgid "%s -An device\t activate partition n, inactivate the other ones\n" msgstr "%s -Un perifèric\t activa la partició n, desactiva la resta\n" -#: fdisk/sfdisk.c:2506 +#: fdisk/sfdisk.c:2509 msgid "no command?\n" msgstr "cap comandament?\n" -#: fdisk/sfdisk.c:2624 +#: fdisk/sfdisk.c:2627 #, fuzzy, c-format msgid "total: %llu blocks\n" msgstr "total: %d blocs\n" -#: fdisk/sfdisk.c:2661 +#: fdisk/sfdisk.c:2664 msgid "usage: sfdisk --print-id device partition-number\n" msgstr "ús: sfdisk --print-id dispositiu partició_número\n" -#: fdisk/sfdisk.c:2663 +#: fdisk/sfdisk.c:2666 msgid "usage: sfdisk --change-id device partition-number Id\n" msgstr "ús: sfdisk --change-id dispositiu número_partició Id\n" -#: fdisk/sfdisk.c:2665 +#: fdisk/sfdisk.c:2668 msgid "usage: sfdisk --id device partition-number [Id]\n" msgstr "ús: sfdisk --id dispositiu partició_número [Id]\n" -#: fdisk/sfdisk.c:2672 +#: fdisk/sfdisk.c:2675 msgid "can specify only one device (except with -l or -s)\n" msgstr "sols podeu especificar un dispositiu (excepte amb -l o -s)\n" -#: fdisk/sfdisk.c:2698 +#: fdisk/sfdisk.c:2701 #, c-format msgid "cannot open %s read-write\n" msgstr "no es pot obrir %s per a lectura-escriptura\n" -#: fdisk/sfdisk.c:2700 +#: fdisk/sfdisk.c:2703 #, c-format msgid "cannot open %s for reading\n" msgstr "no es pot obrir %s per a lectura\n" -#: fdisk/sfdisk.c:2725 +#: fdisk/sfdisk.c:2728 #, c-format msgid "%s: OK\n" msgstr "%s: Correcte\n" -#: fdisk/sfdisk.c:2742 +#: fdisk/sfdisk.c:2745 #, c-format msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n" msgstr "%s : %ld cilindres, %ld capçals, %ld sectors/pista\n" -#: fdisk/sfdisk.c:2759 +#: fdisk/sfdisk.c:2762 #, fuzzy, c-format msgid "Cannot get size of %s\n" msgstr "no es pot aconseguir la mida de %s" -#: fdisk/sfdisk.c:2837 +#: fdisk/sfdisk.c:2840 #, c-format msgid "bad active byte: 0x%x instead of 0x80\n" msgstr "octet actiu incorrecte: 0x%x en comptes de 0x80\n" -#: fdisk/sfdisk.c:2855 fdisk/sfdisk.c:2908 fdisk/sfdisk.c:2939 +#: fdisk/sfdisk.c:2858 fdisk/sfdisk.c:2911 fdisk/sfdisk.c:2942 msgid "" "Done\n" "\n" @@ -5104,7 +5116,7 @@ msgstr "" "Fet\n" "\n" -#: fdisk/sfdisk.c:2864 +#: fdisk/sfdisk.c:2867 #, c-format msgid "" "You have %d active primary partitions. This does not matter for LILO,\n" @@ -5113,35 +5125,35 @@ msgstr "" "Teniu %d particions primàries actives. Això no és important per al LILO,\n" "però el MBR del DOS sols pot arrencar discs amb una partició activa.\n" -#: fdisk/sfdisk.c:2878 +#: fdisk/sfdisk.c:2881 #, c-format msgid "partition %s has id %x and is not hidden\n" msgstr "la partició %s té l'identificador %x i no està oculta\n" -#: fdisk/sfdisk.c:2935 +#: fdisk/sfdisk.c:2938 #, c-format msgid "Bad Id %lx\n" msgstr "Identificador dolent %lx\n" -#: fdisk/sfdisk.c:2950 +#: fdisk/sfdisk.c:2953 msgid "This disk is currently in use.\n" msgstr "Aquest disc està actualment en ús.\n" -#: fdisk/sfdisk.c:2967 +#: fdisk/sfdisk.c:2970 #, c-format msgid "Fatal error: cannot find %s\n" msgstr "Error fatal: No es pot trobar %s\n" -#: fdisk/sfdisk.c:2970 +#: fdisk/sfdisk.c:2973 #, c-format msgid "Warning: %s is not a block device\n" msgstr "Atenció: %s no és un dispositiu de blocs\n" -#: fdisk/sfdisk.c:2976 +#: fdisk/sfdisk.c:2979 msgid "Checking that no-one is using this disk right now ...\n" msgstr "Comprovant que en aquest moment ningú estigui usant aquest disc...\n" -#: fdisk/sfdisk.c:2978 +#: fdisk/sfdisk.c:2981 msgid "" "\n" "This disk is currently in use - repartitioning is probably a bad idea.\n" @@ -5154,28 +5166,28 @@ msgstr "" "swapoff en totes les particions d'intercanvi del disc.\n" "Useu l'etiqueta --no-reread per a suprimir aquesta comprovació.\n" -#: fdisk/sfdisk.c:2982 +#: fdisk/sfdisk.c:2985 msgid "Use the --force flag to overrule all checks.\n" msgstr "Useu l'etiqueta --force per a obviar totes les comprovacions.\n" -#: fdisk/sfdisk.c:2986 +#: fdisk/sfdisk.c:2989 msgid "OK\n" msgstr "Correcte\n" -#: fdisk/sfdisk.c:2995 +#: fdisk/sfdisk.c:2998 msgid "Old situation:\n" msgstr "Antiga situació:\n" -#: fdisk/sfdisk.c:2999 +#: fdisk/sfdisk.c:3002 #, c-format msgid "Partition %d does not exist, cannot change it\n" msgstr "La partició %d no existeix; no es pot canviar\n" -#: fdisk/sfdisk.c:3007 +#: fdisk/sfdisk.c:3010 msgid "New situation:\n" msgstr "Nova situació:\n" -#: fdisk/sfdisk.c:3012 +#: fdisk/sfdisk.c:3015 msgid "" "I don't like these partitions - nothing changed.\n" "(If you really want this, use the --force option.)\n" @@ -5183,19 +5195,19 @@ msgstr "" "No veig aquestes particions adequades - no he canviat res.\n" "(Si realment desitgeu fer això, useu l'opció --force).\n" -#: fdisk/sfdisk.c:3015 +#: fdisk/sfdisk.c:3018 msgid "I don't like this - probably you should answer No\n" msgstr "No veig això adequat - probablement hagueu de respondre No\n" -#: fdisk/sfdisk.c:3020 +#: fdisk/sfdisk.c:3023 msgid "Are you satisfied with this? [ynq] " msgstr "Esteu satisfet amb això? [ynq] " -#: fdisk/sfdisk.c:3022 +#: fdisk/sfdisk.c:3025 msgid "Do you want to write this to disk? [ynq] " msgstr "Desitgeu escriure això al disc? [ynq] " -#: fdisk/sfdisk.c:3027 +#: fdisk/sfdisk.c:3030 msgid "" "\n" "sfdisk: premature end of input\n" @@ -5203,15 +5215,15 @@ msgstr "" "\n" "sfdisk: Final prematur de l'entrada\n" -#: fdisk/sfdisk.c:3029 +#: fdisk/sfdisk.c:3032 msgid "Quitting - nothing changed\n" msgstr "Sortint - no s'ha canviat res\n" -#: fdisk/sfdisk.c:3035 +#: fdisk/sfdisk.c:3038 msgid "Please answer one of y,n,q\n" msgstr "Si us plau responeu amb una: y,n,q\n" -#: fdisk/sfdisk.c:3043 +#: fdisk/sfdisk.c:3046 msgid "" "Successfully wrote the new partition table\n" "\n" @@ -5219,7 +5231,7 @@ msgstr "" "S'ha escrit correctament la nova taula de particions\n" "\n" -#: fdisk/sfdisk.c:3049 +#: fdisk/sfdisk.c:3052 msgid "" "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n" "to zero the first 512 bytes: dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n" @@ -6205,8 +6217,8 @@ msgid "Password error." msgstr "Error de contrasenya." #: login-utils/chfn.c:203 login-utils/chsh.c:200 login-utils/login.c:774 -#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:304 -#: mount/lomount.c:311 +#: login-utils/newgrp.c:48 login-utils/simpleinit.c:338 mount/lomount.c:293 +#: mount/lomount.c:296 msgid "Password: " msgstr "Contrasenya: " @@ -6590,55 +6602,55 @@ msgstr "ACCCÉS EN %s PER %s DES DE %s" msgid "LOGIN ON %s BY %s" msgstr "ACCÉS EN %s PER %s" -#: login-utils/login.c:1091 +#: login-utils/login.c:1100 msgid "You have new mail.\n" msgstr "Teniu correu nou.\n" -#: login-utils/login.c:1093 +#: login-utils/login.c:1102 msgid "You have mail.\n" msgstr "Teniu correu.\n" #. error in fork() -#: login-utils/login.c:1111 +#: login-utils/login.c:1122 #, c-format msgid "login: failure forking: %s" msgstr "login: Falla l'establiment del canvi: %s" -#: login-utils/login.c:1148 +#: login-utils/login.c:1159 #, c-format msgid "TIOCSCTTY failed: %m" msgstr "TIOCSCTTY ha fallat: %m" -#: login-utils/login.c:1154 +#: login-utils/login.c:1165 msgid "setuid() failed" msgstr "setuid() ha fallat" -#: login-utils/login.c:1160 +#: login-utils/login.c:1171 #, c-format msgid "No directory %s!\n" msgstr "No hi ha cap directori %s\n" -#: login-utils/login.c:1164 +#: login-utils/login.c:1175 msgid "Logging in with home = \"/\".\n" msgstr "Accedint amb el directori inicial = \"/\".\n" -#: login-utils/login.c:1172 +#: login-utils/login.c:1183 msgid "login: no memory for shell script.\n" msgstr "" "login: Memòria esgotada per a l'script de l'intèrpret de comandaments.\n" -#: login-utils/login.c:1199 +#: login-utils/login.c:1210 #, c-format msgid "login: couldn't exec shell script: %s.\n" msgstr "" "login: No s'ha pogut executar l'script de l'intèrpret de comandaments: %s.\n" -#: login-utils/login.c:1202 +#: login-utils/login.c:1213 #, c-format msgid "login: no shell: %s.\n" msgstr "login: No hi ha intèrpret de comandaments: %s.\n" -#: login-utils/login.c:1217 +#: login-utils/login.c:1228 #, c-format msgid "" "\n" @@ -6647,62 +6659,62 @@ msgstr "" "\n" "Accés de %s: " -#: login-utils/login.c:1228 +#: login-utils/login.c:1239 msgid "login name much too long.\n" msgstr "nom d'accés massa llarg.\n" -#: login-utils/login.c:1229 +#: login-utils/login.c:1240 msgid "NAME too long" msgstr "NOM massa llarg" -#: login-utils/login.c:1236 +#: login-utils/login.c:1247 msgid "login names may not start with '-'.\n" msgstr "els noms d'accés no poden començar per '-'.\n" -#: login-utils/login.c:1246 +#: login-utils/login.c:1257 msgid "too many bare linefeeds.\n" msgstr "masses salts de pàgina solitaris.\n" -#: login-utils/login.c:1247 +#: login-utils/login.c:1258 msgid "EXCESSIVE linefeeds" msgstr "MASSES salts de pàgina" -#: login-utils/login.c:1279 +#: login-utils/login.c:1290 #, c-format msgid "Login timed out after %d seconds\n" msgstr "L'intent d'accés ha esgotat el temps d'espera després de %d segons\n" -#: login-utils/login.c:1367 +#: login-utils/login.c:1378 #, c-format msgid "Last login: %.*s " msgstr "Últim accés: %.*s " -#: login-utils/login.c:1371 +#: login-utils/login.c:1382 #, c-format msgid "from %.*s\n" msgstr "des de %.*s\n" -#: login-utils/login.c:1374 +#: login-utils/login.c:1385 #, c-format msgid "on %.*s\n" msgstr "en %.*s\n" -#: login-utils/login.c:1394 +#: login-utils/login.c:1405 #, c-format msgid "LOGIN FAILURE FROM %s, %s" msgstr "ACCÉS FALLIT DES DE %s, %s" -#: login-utils/login.c:1397 +#: login-utils/login.c:1408 #, c-format msgid "LOGIN FAILURE ON %s, %s" msgstr "ACCÉS FALLIT EN %s, %s" -#: login-utils/login.c:1401 +#: login-utils/login.c:1412 #, c-format msgid "%d LOGIN FAILURES FROM %s, %s" msgstr "%d FALLES EN L'ACCÉS DES DE %s, %s" -#: login-utils/login.c:1404 +#: login-utils/login.c:1415 #, c-format msgid "%d LOGIN FAILURES ON %s, %s" msgstr "%d FALLES EN L'ACCÉS EN %s, %s" @@ -7070,7 +7082,7 @@ msgstr "l'obertura del directori ha fallat.\n" msgid "fork failed\n" msgstr "l'establiment del canvi ha fallat\n" -#: login-utils/simpleinit.c:537 text-utils/more.c:1734 +#: login-utils/simpleinit.c:537 text-utils/more.c:1622 msgid "exec failed\n" msgstr "l'execució (exec) ha fallat\n" @@ -7208,25 +7220,26 @@ msgstr "%s: No es pot executar stat al fitxer temporal.\n" msgid "%s: can't read temporary file.\n" msgstr "%s: No es pot llegir el fitxer temporal.\n" -#: misc-utils/cal.c:262 +#: misc-utils/cal.c:327 msgid "illegal month value: use 1-12" msgstr "valor de més no permes: Usar 1-12" -#: misc-utils/cal.c:266 +#: misc-utils/cal.c:331 msgid "illegal year value: use 1-9999" msgstr "valor de més no permes: Usar 1-9999" -#. %s is the month name, %d the year number. +#. +#. * %s is the month name, %d the year number. #. * you can change the order and/or add something here; eg for #. * Basque the translation should be: "%2$dko %1$s", and #. * the Vietnamese should be "%s na(m %d", etc. #. -#: misc-utils/cal.c:373 +#: misc-utils/cal.c:439 #, c-format msgid "%s %d" msgstr "%s de %d" -#: misc-utils/cal.c:676 +#: misc-utils/cal.c:780 msgid "usage: cal [-13smjyV] [[month] year]\n" msgstr "ús: cal [-13smjyV] [[mes] any]\n" @@ -7737,100 +7750,104 @@ msgstr "error al canviar el mode de %s: %s\n" msgid "can't rename %s to %s: %s\n" msgstr "no es pot reanomenar %s per %s: %s\n" -#: mount/lomount.c:85 +#: mount/lomount.c:73 #, c-format msgid "loop: can't open device %s: %s\n" msgstr "loop: No es pot obrir el dispositiu %s: %s\n" -#: mount/lomount.c:101 +#: mount/lomount.c:89 #, c-format msgid ", offset %lld" msgstr ", desplaçament %lld" -#: mount/lomount.c:104 +#: mount/lomount.c:92 #, c-format msgid ", sizelimit %lld" msgstr ", mida límit %lld" -#: mount/lomount.c:112 +#: mount/lomount.c:100 #, c-format msgid ", encryption %s (type %d)" msgstr ", xifrat %s (tipus %d)" -#: mount/lomount.c:126 +#: mount/lomount.c:114 #, c-format msgid ", offset %d" msgstr ", desplaçament %d" -#: mount/lomount.c:129 +#: mount/lomount.c:117 #, c-format msgid ", encryption type %d\n" msgstr ", tipus de xifrat %d\n" -#: mount/lomount.c:138 +#: mount/lomount.c:126 #, c-format msgid "loop: can't get info on device %s: %s\n" msgstr "loop: No es pot obtindre informació sobre el dispositiu %s: %s\n" -#: mount/lomount.c:189 -msgid "mount: could not find any device /dev/loop#" +#: mount/lomount.c:177 +#, fuzzy, c-format +msgid "%s: could not find any device /dev/loop#" msgstr "mount: No es pot trobar cap dispositiu /dev/loop#" -#: mount/lomount.c:192 +#: mount/lomount.c:180 +#, fuzzy, c-format msgid "" -"mount: Could not find any loop device. Maybe this kernel does not know\n" +"%s: Could not find any loop device. Maybe this kernel does not know\n" " about the loop device? (If so, recompile or `modprobe loop'.)" msgstr "" "mount: No es pot trobar cap dispositiu loop. Podria ser que el nucli no el\n" " reconeguès?. (Si es això, recompileu o feu `modprobe loop')." -#: mount/lomount.c:197 -msgid "mount: could not find any free loop device" +#: mount/lomount.c:185 +#, fuzzy, c-format +msgid "%s: could not find any free loop device" msgstr "mount: No es pot trobar cap dispositiu loop lliure" -#: mount/lomount.c:294 +#: mount/lomount.c:283 msgid "Couldn't lock into memory, exiting.\n" msgstr "No es pot blocar en memòria, sortint.\n" -#: mount/lomount.c:349 +#: mount/lomount.c:337 #, fuzzy, c-format msgid "set_loop(%s,%s,%llu): success\n" msgstr "set_loop(%s,%s,%d): Correcte\n" -#: mount/lomount.c:360 +#: mount/lomount.c:348 #, c-format msgid "loop: can't delete device %s: %s\n" msgstr "loop: No es pot suprimir el dispositiu %s: %s\n" -#: mount/lomount.c:370 +#: mount/lomount.c:358 #, c-format msgid "del_loop(%s): success\n" msgstr "del_loop(%s): Correcte\n" -#: mount/lomount.c:378 +#: mount/lomount.c:366 msgid "This mount was compiled without loop support. Please recompile.\n" msgstr "" "Aquest mount s'ha compilat sense suport loop. Si us plau, recompileu-lo.\n" -#: mount/lomount.c:415 -#, c-format +#: mount/lomount.c:403 +#, fuzzy, c-format msgid "" "usage:\n" -" %s loop_device # give info\n" -" %s -d loop_device # delete\n" -" %s [ -e encryption ] [ -o offset ] loop_device file # setup\n" +" %s loop_device # give info\n" +" %s -d loop_device # delete\n" +" %s -f # find unused\n" +" %s [-e encryption] [-o offset] {-f|loop_device} file # setup\n" msgstr "" "ús:\n" " %s dispositiu_loop # dona informació\n" " %s -d dispositiu_loop # elimina\n" " %s [ -e xifrat ] [ -o desplaça. ] disp_loop fitxer # configura\n" -#: mount/lomount.c:433 mount/sundries.c:30 mount/sundries.c:45 +#: mount/lomount.c:422 mount/sundries.c:30 mount/sundries.c:45 #: mount/sundries.c:248 msgid "not enough memory" msgstr "no hi ha prou memòria" -#: mount/lomount.c:513 +#: mount/lomount.c:537 msgid "No loop support was available at compile time. Please recompile.\n" msgstr "" "Quan es va compilar el suport loop no estava disponible. Si us plau, " @@ -7850,166 +7867,166 @@ msgstr "[mntent]: La línia %d de %s és incorrecta%s\n" msgid "; rest of file ignored" msgstr "; la resta del fitxer s'ignorarà" -#: mount/mount.c:371 +#: mount/mount.c:375 #, c-format msgid "mount: according to mtab, %s is already mounted on %s" msgstr "mount: Segons mtab, %s ja està muntat en %s" -#: mount/mount.c:376 +#: mount/mount.c:380 #, c-format msgid "mount: according to mtab, %s is mounted on %s" msgstr "mount: Segons mtab, %s està muntat en %s" -#: mount/mount.c:396 +#: mount/mount.c:400 #, c-format msgid "mount: can't open %s for writing: %s" msgstr "mount: No es pot obrir %s per a escriptura: %s" -#: mount/mount.c:413 mount/mount.c:640 +#: mount/mount.c:417 mount/mount.c:670 #, c-format msgid "mount: error writing %s: %s" msgstr "mount: Error escrivint %s: %s" -#: mount/mount.c:421 +#: mount/mount.c:425 #, c-format msgid "mount: error changing mode of %s: %s" msgstr "mount: Error al canviar el mode de %s: %s" -#: mount/mount.c:472 +#: mount/mount.c:476 #, c-format msgid "%s looks like swapspace - not mounted" msgstr "%s sembla espai d'intercanvi - no muntat" -#: mount/mount.c:532 +#: mount/mount.c:563 msgid "mount failed" msgstr "el muntatge ha fallat" -#: mount/mount.c:534 +#: mount/mount.c:565 #, c-format msgid "mount: only root can mount %s on %s" msgstr "mount: Sols l'usuari root pot muntar %s en %s" -#: mount/mount.c:563 +#: mount/mount.c:593 msgid "mount: loop device specified twice" msgstr "mount: El dispositiu loop està especificat dues vegades" -#: mount/mount.c:568 +#: mount/mount.c:598 msgid "mount: type specified twice" msgstr "mount: El tipus està especificat dues vegades" -#: mount/mount.c:580 +#: mount/mount.c:610 msgid "mount: skipping the setup of a loop device\n" msgstr "mount: Saltant-se la configuració d'un dispositiu loop\n" -#: mount/mount.c:589 +#: mount/mount.c:619 #, c-format msgid "mount: going to use the loop device %s\n" msgstr "mount: S'usarà el dispositiu loop %s\n" -#: mount/mount.c:594 +#: mount/mount.c:624 msgid "mount: failed setting up loop device\n" msgstr "mount: Falla al configurar el dispositiu loop\n" -#: mount/mount.c:598 +#: mount/mount.c:628 msgid "mount: setup loop device successfully\n" msgstr "mount: Configuració correcta del dispositiu loop\n" -#: mount/mount.c:635 +#: mount/mount.c:665 #, c-format msgid "mount: can't open %s: %s" msgstr "mount: No es pot obrir %s: %s" -#: mount/mount.c:656 +#: mount/mount.c:686 msgid "mount: argument to -p or --pass-fd must be a number" msgstr "mount: L'argument per a -p o --pass-fd hauria de ser un número" -#: mount/mount.c:669 +#: mount/mount.c:699 #, c-format msgid "mount: cannot open %s for setting speed" msgstr "mount: No es pot obrir %s per a establir-ne la velocitat" -#: mount/mount.c:672 +#: mount/mount.c:702 #, c-format msgid "mount: cannot set speed: %s" msgstr "mount: No es pot establir la velocitat de: %s" -#: mount/mount.c:726 mount/mount.c:1302 +#: mount/mount.c:756 mount/mount.c:1336 #, c-format msgid "mount: cannot fork: %s" msgstr "mount: No es pot establir el canvi: %s" -#: mount/mount.c:814 +#: mount/mount.c:844 msgid "mount: this version was compiled without support for the type `nfs'" msgstr "" "mount: Aquesta versió ha estat compilada sense suport per al tipus `nfs'" -#: mount/mount.c:854 +#: mount/mount.c:884 msgid "mount: failed with nfs mount version 4, trying 3..\n" msgstr "mount : Falla al muntar la versió 4 de nfs, escolliu la 3...\n" -#: mount/mount.c:865 +#: mount/mount.c:895 msgid "" "mount: I could not determine the filesystem type, and none was specified" msgstr "" "mount: No es pot determinar el tipus del sistema de fitxers i no n'heu " "especificat cap" -#: mount/mount.c:868 +#: mount/mount.c:898 msgid "mount: you must specify the filesystem type" msgstr "mount: Haureu d'especificar el tipus del sistema de fitxers" #. should not happen -#: mount/mount.c:871 +#: mount/mount.c:901 msgid "mount: mount failed" msgstr "mount: El muntatge ha fallat" -#: mount/mount.c:877 mount/mount.c:912 +#: mount/mount.c:907 mount/mount.c:942 #, c-format msgid "mount: mount point %s is not a directory" msgstr "mount: El punt de muntatge %s no és un directori" -#: mount/mount.c:879 +#: mount/mount.c:909 msgid "mount: permission denied" msgstr "mount: Permís denegat" -#: mount/mount.c:881 +#: mount/mount.c:911 msgid "mount: must be superuser to use mount" msgstr "mount: Haureu de ser un superusuari per a usar mount" #. heuristic: if /proc/version exists, then probably proc is mounted #. proc mounted? -#: mount/mount.c:885 mount/mount.c:889 +#: mount/mount.c:915 mount/mount.c:919 #, c-format msgid "mount: %s is busy" msgstr "mount: %s està ocupat" #. no #. yes, don't mention it -#: mount/mount.c:891 +#: mount/mount.c:921 msgid "mount: proc already mounted" msgstr "mount: proc ja està muntat" -#: mount/mount.c:893 +#: mount/mount.c:923 #, c-format msgid "mount: %s already mounted or %s busy" msgstr "mount: %s ja està muntat o %s està ocupat" -#: mount/mount.c:899 +#: mount/mount.c:929 #, c-format msgid "mount: mount point %s does not exist" msgstr "mount: El punt de muntatge %s no existeix" -#: mount/mount.c:901 +#: mount/mount.c:931 #, c-format msgid "mount: mount point %s is a symbolic link to nowhere" msgstr "mount: El punt de muntatge %s és un enllaç simbòlic sense destí" -#: mount/mount.c:904 +#: mount/mount.c:934 #, c-format msgid "mount: special device %s does not exist" msgstr "mount: El dispositiu especial %s no existeix" -#: mount/mount.c:914 +#: mount/mount.c:944 #, c-format msgid "" "mount: special device %s does not exist\n" @@ -8018,55 +8035,55 @@ msgstr "" "mount: El dispositiu especial %s no existeix\n" " (una ruta prefixada no és un directori)\n" -#: mount/mount.c:927 +#: mount/mount.c:957 #, c-format msgid "mount: %s not mounted already, or bad option" msgstr "mount: %s encara no està muntat o una opció és incorrecta" -#: mount/mount.c:929 -#, c-format +#: mount/mount.c:959 +#, fuzzy, c-format msgid "" "mount: wrong fs type, bad option, bad superblock on %s,\n" -" or too many mounted file systems" +" missing codepage, or too many mounted file systems" msgstr "" "mount: Tipus del sistema de fitxers incorrecte, opció incorrecta,\n" " superbloc incorrecte en %s o masses sistemes de fitxers muntats" -#: mount/mount.c:963 +#: mount/mount.c:993 msgid "mount table full" msgstr "taula de dispositius muntats completa" -#: mount/mount.c:965 +#: mount/mount.c:995 #, c-format msgid "mount: %s: can't read superblock" msgstr "mount: %s: No es pot llegir el superbloc" -#: mount/mount.c:969 +#: mount/mount.c:999 #, c-format msgid "mount: %s: unknown device" msgstr "umount: %s: Dispositiu desconegut" -#: mount/mount.c:974 +#: mount/mount.c:1004 #, fuzzy, c-format msgid "mount: unknown filesystem type '%s'" msgstr " l Llistar els tipus de sistemes de fitxers coneguts" -#: mount/mount.c:986 +#: mount/mount.c:1016 #, c-format msgid "mount: probably you meant %s" msgstr "mount: Probablement volíeu referir-vos a %s" -#: mount/mount.c:988 +#: mount/mount.c:1018 #, fuzzy msgid "mount: maybe you meant 'iso9660'?" msgstr "mount: Potser volíeu referir-vos a iso9660 ?" -#: mount/mount.c:990 +#: mount/mount.c:1020 #, fuzzy msgid "mount: maybe you meant 'vfat'?" msgstr "mount: Potser volíeu referir-vos a iso9660 ?" -#: mount/mount.c:993 +#: mount/mount.c:1023 #, c-format msgid "mount: %s has wrong device number or fs type %s not supported" msgstr "" @@ -8074,12 +8091,12 @@ msgstr "" "fitxers %s no està suportat" #. strange ... -#: mount/mount.c:999 +#: mount/mount.c:1029 #, c-format msgid "mount: %s is not a block device, and stat fails?" msgstr "mount: %s no és un dispositiu de blocs, i stat falla?" -#: mount/mount.c:1001 +#: mount/mount.c:1031 #, c-format msgid "" "mount: the kernel does not recognize %s as a block device\n" @@ -8088,51 +8105,51 @@ msgstr "" "mount: El nucli no reconeix %s com a un dispositiu de blocs\n" " (potser fent `insmod controlador'?)" -#: mount/mount.c:1004 +#: mount/mount.c:1034 #, c-format msgid "mount: %s is not a block device (maybe try `-o loop'?)" msgstr "mount: %s no és un dispositiu de blocs (proveu amb `-o loop')" -#: mount/mount.c:1007 +#: mount/mount.c:1037 #, c-format msgid "mount: %s is not a block device" msgstr "mount: %s no és un dispositiu de blocs" -#: mount/mount.c:1010 +#: mount/mount.c:1040 #, c-format msgid "mount: %s is not a valid block device" msgstr "mount: %s no és un dispositiu de blocs vàlid" #. pre-linux 1.1.38, 1.1.41 and later #. linux 1.1.38 and later -#: mount/mount.c:1013 +#: mount/mount.c:1043 msgid "block device " msgstr "dispositiu de blocs " -#: mount/mount.c:1015 +#: mount/mount.c:1045 #, c-format msgid "mount: cannot mount %s%s read-only" msgstr "mount : No es pot muntar %s%s com a sols lectura" -#: mount/mount.c:1019 +#: mount/mount.c:1049 #, c-format msgid "mount: %s%s is write-protected but explicit `-w' flag given" msgstr "" "mount : %s%s està protegit contra escriptura però se li ha donat l'etiqueta " "explicita `-w'" -#: mount/mount.c:1036 +#: mount/mount.c:1066 #, c-format msgid "mount: %s%s is write-protected, mounting read-only" msgstr "" "mount: %s%s està protegit contra escriptura; es muntarà en sols lectura" -#: mount/mount.c:1135 +#: mount/mount.c:1165 msgid "mount: no type was given - I'll assume nfs because of the colon\n" msgstr "" "mount: No s'ha especificat cap tipus; s'assumeix nfs per als dos punts\n" -#: mount/mount.c:1140 +#: mount/mount.c:1171 msgid "mount: no type was given - I'll assume smbfs because of the // prefix\n" msgstr "" "mount: No s'ha especificat cap tipus - s'assumeix smbfs per al prefix //\n" @@ -8140,22 +8157,22 @@ msgstr "" #. #. * Retry in the background. #. -#: mount/mount.c:1156 +#: mount/mount.c:1188 #, c-format msgid "mount: backgrounding \"%s\"\n" msgstr "mount: Executant en segon plà \"%s\"\n" -#: mount/mount.c:1167 +#: mount/mount.c:1199 #, c-format msgid "mount: giving up \"%s\"\n" msgstr "mount: Abandonant \"%s\"\n" -#: mount/mount.c:1247 +#: mount/mount.c:1281 #, c-format msgid "mount: %s already mounted on %s\n" msgstr "mount: %s ja està muntat en %s\n" -#: mount/mount.c:1380 +#: mount/mount.c:1414 msgid "" "Usage: mount -V : print version\n" " mount -h : print this help\n" @@ -8201,34 +8218,34 @@ msgstr "" "usant -U uuid. D'altres opcions: [-nfFrsvw] [-o opcions].\n" "Per a més detalls, escriviu man 8 mount.\n" -#: mount/mount.c:1562 +#: mount/mount.c:1603 msgid "mount: only root can do that" msgstr "mount: Sols l'usuari root pot fer això" -#: mount/mount.c:1567 +#: mount/mount.c:1608 #, c-format msgid "mount: no %s found - creating it..\n" msgstr "mount: No s'ha trobat %s; s'està creant...\n" -#: mount/mount.c:1579 +#: mount/mount.c:1620 msgid "mount: no such partition found" msgstr "mount: No troba aquesta partició" -#: mount/mount.c:1581 +#: mount/mount.c:1622 #, c-format msgid "mount: mounting %s\n" msgstr "mount: Muntant %s\n" -#: mount/mount.c:1590 +#: mount/mount.c:1631 msgid "nothing was mounted" msgstr "no s'ha muntat res" -#: mount/mount.c:1605 +#: mount/mount.c:1646 #, c-format msgid "mount: cannot find %s in %s" msgstr "mount: No es pot trobar %s en %s" -#: mount/mount.c:1620 +#: mount/mount.c:1661 #, c-format msgid "mount: can't find %s in %s or %s" msgstr "mount: No es pot trobar %s en %s o %s" @@ -8412,101 +8429,106 @@ msgstr "swapon: Saltant-se el fitxer %s - sembla que està a troços.\n" msgid "Not superuser.\n" msgstr "No és el superusuari.\n" -#: mount/swapon.c:312 mount/swapon.c:402 +#: mount/swapon.c:312 mount/swapon.c:407 #, c-format msgid "%s: cannot open %s: %s\n" msgstr "%s: No es pot obrir %s: %s\n" -#: mount/umount.c:77 +#: mount/umount.c:51 msgid "umount: compiled without support for -f\n" msgstr "umount: Està compilat sense suporte per a -f\n" -#: mount/umount.c:150 +#: mount/umount.c:141 +#, fuzzy, c-format +msgid "umount: cannot fork: %s" +msgstr "mount: No es pot establir el canvi: %s" + +#: mount/umount.c:174 #, c-format msgid "host: %s, directory: %s\n" msgstr "màquina: %s, directori: %s\n" -#: mount/umount.c:170 +#: mount/umount.c:194 #, c-format msgid "umount: can't get address for %s\n" msgstr "umount: No es pot obtindre l'adreça per a %s\n" -#: mount/umount.c:175 +#: mount/umount.c:199 msgid "umount: got bad hostp->h_length\n" msgstr "umount: Valor incorrecte per a hostp->h_length\n" -#: mount/umount.c:223 +#: mount/umount.c:247 #, c-format msgid "umount: %s: invalid block device" msgstr "umount: %s: Dispositiu de blocs no vàlid" -#: mount/umount.c:225 +#: mount/umount.c:249 #, c-format msgid "umount: %s: not mounted" msgstr "umount: %s: No està muntat" -#: mount/umount.c:227 +#: mount/umount.c:251 #, c-format msgid "umount: %s: can't write superblock" msgstr "umount: %s: No es pot escriure el superbloc" #. Let us hope fstab has a line "proc /proc ..." #. and not "none /proc ..." -#: mount/umount.c:231 +#: mount/umount.c:255 #, c-format msgid "umount: %s: device is busy" msgstr "umount: %s: Dispositiu ocupat" -#: mount/umount.c:233 +#: mount/umount.c:257 #, c-format msgid "umount: %s: not found" msgstr "umount: %s: No s'ha trobat" -#: mount/umount.c:235 +#: mount/umount.c:259 #, c-format msgid "umount: %s: must be superuser to umount" msgstr "umount: %s: Haureu de ser superusuari per a usar umount" -#: mount/umount.c:237 +#: mount/umount.c:261 #, c-format msgid "umount: %s: block devices not permitted on fs" msgstr "umount: %s: Dispositius de blocs no permesos en el sistema de fitxers" -#: mount/umount.c:239 +#: mount/umount.c:263 #, c-format msgid "umount: %s: %s" msgstr "umount: %s: %s" -#: mount/umount.c:287 +#: mount/umount.c:319 msgid "no umount2, trying umount...\n" msgstr "umount2 no existeix, s'està provant amb umount...\n" -#: mount/umount.c:303 +#: mount/umount.c:335 #, c-format msgid "could not umount %s - trying %s instead\n" msgstr "no es pot executar umount en %s - es provarà amb %s\n" -#: mount/umount.c:321 +#: mount/umount.c:353 #, c-format msgid "umount: %s busy - remounted read-only\n" msgstr "umount: %s ocupat - tornat a muntar en sols lectura\n" -#: mount/umount.c:331 +#: mount/umount.c:363 #, c-format msgid "umount: could not remount %s read-only\n" msgstr "umount: No es pot tornar a muntar %s en sols lectura\n" -#: mount/umount.c:340 +#: mount/umount.c:372 #, c-format msgid "%s umounted\n" msgstr "%s desmuntat\n" -#: mount/umount.c:438 +#: mount/umount.c:470 msgid "umount: cannot find list of filesystems to unmount" msgstr "" "umount: No es pot trobar la llista dels sistemes de fitxers per a desmuntar" -#: mount/umount.c:469 +#: mount/umount.c:501 msgid "" "Usage: umount [-hV]\n" " umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n" @@ -8517,42 +8539,42 @@ msgstr "" "opcions]\n" " umount [-f] [-r] [-n] [-v] especial | node...\n" -#: mount/umount.c:521 +#: mount/umount.c:554 #, c-format msgid "Trying to umount %s\n" msgstr "S'intenta desmuntar %s\n" -#: mount/umount.c:527 +#: mount/umount.c:560 #, c-format msgid "Could not find %s in mtab\n" msgstr "No es pot trobar a %s en mtab\n" -#: mount/umount.c:534 +#: mount/umount.c:567 #, c-format msgid "umount: %s is not mounted (according to mtab)" msgstr "umount: %s no està muntat (segons mtab)" -#: mount/umount.c:538 +#: mount/umount.c:571 #, c-format msgid "umount: it seems %s is mounted multiple times" msgstr "umount: Sembla que %s ha estat muntat diverses vegades" -#: mount/umount.c:551 +#: mount/umount.c:584 #, c-format msgid "umount: %s is not in the fstab (and you are not root)" msgstr "umount: %s no està en el fstab (i no sou el root)" -#: mount/umount.c:555 +#: mount/umount.c:588 #, c-format msgid "umount: %s mount disagrees with the fstab" msgstr "umount: El muntatge de %s no concorda amb el fstab" -#: mount/umount.c:593 +#: mount/umount.c:629 #, fuzzy, c-format msgid "umount: only %s can unmount %s from %s" msgstr "umount: Sols el root pot desmuntar %s des de %s" -#: mount/umount.c:665 +#: mount/umount.c:710 msgid "umount: only root can do that" msgstr "umount: Sols el root pot fer això" @@ -9460,7 +9482,7 @@ msgstr "%s: No es pot trobar \"_stext\" en %s\n" msgid "%s: profile address out of range. Wrong map file?\n" msgstr "%s adreça del perfil fora del rang. Fitxer `map' incorrecte?\n" -#: sys-utils/readprofile.c:397 +#: sys-utils/readprofile.c:401 msgid "total" msgstr "total" @@ -9616,12 +9638,17 @@ msgstr "" "hexdump: [-bcCdovx] [-e fmt] [-f fitxer_fmt] [-n longitud] [-s ometre] " "[fitxer ...]\n" -#: text-utils/more.c:263 +#: text-utils/more.c:261 #, c-format msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n" msgstr "ús: %s [-dflpcsu] [+núm_línies | +/patró] nom1 nom2 ...\n" -#: text-utils/more.c:521 +#: text-utils/more.c:485 +#, fuzzy, c-format +msgid "%s: unknown option \"-%c\"\n" +msgstr "%s: Senyal desconeguda %s\n" + +#: text-utils/more.c:517 #, c-format msgid "" "\n" @@ -9633,7 +9660,7 @@ msgstr "" "\n" #. simple ELF detection -#: text-utils/more.c:564 +#: text-utils/more.c:560 #, c-format msgid "" "\n" @@ -9644,42 +9671,42 @@ msgstr "" "**** %s: No és un fitxer de text ****\n" "\n" -#: text-utils/more.c:667 +#: text-utils/more.c:663 msgid "[Use q or Q to quit]" msgstr "[Usar q o Q per a sortir]" -#: text-utils/more.c:847 +#: text-utils/more.c:755 msgid "--More--" msgstr "--Més--" -#: text-utils/more.c:849 +#: text-utils/more.c:757 #, c-format msgid "(Next file: %s)" msgstr "(Següent fitxer: %s)" -#: text-utils/more.c:855 +#: text-utils/more.c:762 msgid "[Press space to continue, 'q' to quit.]" msgstr "[Pressionar la barra espaiadora per a continuar; 'q' per a sortir.]" -#: text-utils/more.c:1269 +#: text-utils/more.c:1161 #, c-format msgid "...back %d pages" msgstr "...retrocedir %d pàgines" -#: text-utils/more.c:1271 +#: text-utils/more.c:1163 msgid "...back 1 page" msgstr "...retrocedir 1 pàgina" -#: text-utils/more.c:1314 +#: text-utils/more.c:1206 msgid "...skipping one line" msgstr "...ometent una línia" -#: text-utils/more.c:1316 +#: text-utils/more.c:1208 #, c-format msgid "...skipping %d lines" msgstr "...ometent %d línies" -#: text-utils/more.c:1353 +#: text-utils/more.c:1245 msgid "" "\n" "***Back***\n" @@ -9689,7 +9716,7 @@ msgstr "" "***Endarrera***\n" "\n" -#: text-utils/more.c:1391 +#: text-utils/more.c:1283 msgid "" "\n" "Most commands optionally preceded by integer argument k. Defaults in " @@ -9702,7 +9729,7 @@ msgstr "" "L'asterisc (*) indica que l'argument esdevé el nou per omissió.\n" # a.b: Falta arranjar això de "kth" -#: text-utils/more.c:1398 +#: text-utils/more.c:1290 msgid "" " Display next k lines of text [current screen size]\n" "z Display next k lines of text [current screen size]*\n" @@ -9747,33 +9774,33 @@ msgstr "" ":f Mostra el nom del fitxer i el número de línia\n" ". Repeteix el comandament anterior\n" -#: text-utils/more.c:1470 text-utils/more.c:1475 +#: text-utils/more.c:1359 text-utils/more.c:1364 msgid "[Press 'h' for instructions.]" msgstr "[Prémer 'h' per a les instruccions.]" -#: text-utils/more.c:1509 +#: text-utils/more.c:1398 #, c-format msgid "\"%s\" line %d" msgstr "\"%s\" línia %d" -#: text-utils/more.c:1511 +#: text-utils/more.c:1400 #, c-format msgid "[Not a file] line %d" msgstr "[No és un fitxer] línia %d" -#: text-utils/more.c:1595 +#: text-utils/more.c:1484 msgid " Overflow\n" msgstr " Desbordament\n" -#: text-utils/more.c:1642 +#: text-utils/more.c:1531 msgid "...skipping\n" msgstr "...ometent\n" -#: text-utils/more.c:1672 +#: text-utils/more.c:1560 msgid "Regular expression botch" msgstr "Error en l'expressió regular" -#: text-utils/more.c:1684 +#: text-utils/more.c:1572 msgid "" "\n" "Pattern not found\n" @@ -9781,15 +9808,15 @@ msgstr "" "\n" "Patró no trobat\n" -#: text-utils/more.c:1687 text-utils/pg.c:1145 text-utils/pg.c:1296 +#: text-utils/more.c:1575 text-utils/pg.c:1145 text-utils/pg.c:1296 msgid "Pattern not found" msgstr "Patró no trobat" -#: text-utils/more.c:1748 +#: text-utils/more.c:1636 msgid "can't fork\n" msgstr "no es pot establir el canvi\n" -#: text-utils/more.c:1787 +#: text-utils/more.c:1675 msgid "" "\n" "...Skipping " @@ -9797,19 +9824,19 @@ msgstr "" "\n" "...Saltant " -#: text-utils/more.c:1792 +#: text-utils/more.c:1679 msgid "...Skipping to file " msgstr "...Saltant al fitxer " -#: text-utils/more.c:1794 +#: text-utils/more.c:1681 msgid "...Skipping back to file " msgstr "...Retrocedint al fitxer " -#: text-utils/more.c:2074 +#: text-utils/more.c:1959 msgid "Line too long" msgstr "Línia massa llarga" -#: text-utils/more.c:2117 +#: text-utils/more.c:2002 msgid "No previous command to substitute for" msgstr "No hi ha cap comandament previ a substituir" diff --git a/po/cat-id-tbl.c b/po/cat-id-tbl.c index 9b089972..544e152a 100644 --- a/po/cat-id-tbl.c +++ b/po/cat-id-tbl.c @@ -606,7 +606,7 @@ and could in certain setups cause problems with:\n\ 2) booting and partitioning software from other OSs\n\ (e.g., DOS FDISK, OS/2 FDISK)\n", 491}, {"Bad offset in primary extended partition\n", 492}, - {"Warning: deleting partitions after %d\n", 493}, + {"Warning: omitting partitions after %d\n", 493}, {"Warning: extra link pointer in partition table %d\n", 494}, {"Warning: ignoring extra data in partition table %d\n", 495}, {"\ @@ -685,89 +685,93 @@ Units = %s of %d * %d = %d bytes\n\ {"\ Nothing to do. Ordering is correct already.\n\ \n", 539}, - {"%*s Boot Start End Blocks Id System\n", 540}, - {"Device", 541}, + {"\ +This doesn't look like a partition table\n\ +Probably you selected the wrong device.\n\ +\n", 540}, + {"%*s Boot Start End Blocks Id System\n", 541}, + {"Device", 542}, {"\ \n\ -Partition table entries are not in disk order\n", 542}, +Partition table entries are not in disk order\n", 543}, {"\ \n\ Disk %s: %d heads, %d sectors, %d cylinders\n\ -\n", 543}, - {"Nr AF Hd Sec Cyl Hd Sec Cyl Start Size ID\n", 544}, - {"Warning: partition %d contains sector 0\n", 545}, - {"Partition %d: head %d greater than maximum %d\n", 546}, - {"Partition %d: sector %d greater than maximum %d\n", 547}, - {"Partitions %d: cylinder %d greater than maximum %d\n", 548}, - {"Partition %d: previous sectors %d disagrees with total %d\n", 549}, - {"Warning: bad start-of-data in partition %d\n", 550}, - {"Warning: partition %d overlaps partition %d.\n", 551}, - {"Warning: partition %d is empty\n", 552}, - {"Logical partition %d not entirely in partition %d\n", 553}, - {"Total allocated sectors %d greater than the maximum %lld\n", 554}, - {"%lld unallocated sectors\n", 555}, - {"Partition %d is already defined. Delete it before re-adding it.\n", 556}, - {"First %s", 557}, - {"Sector %d is already allocated\n", 558}, - {"No free sectors available\n", 559}, - {"Last %s or +size or +sizeM or +sizeK", 560}, +\n", 544}, + {"Nr AF Hd Sec Cyl Hd Sec Cyl Start Size ID\n", 545}, + {"Warning: partition %d contains sector 0\n", 546}, + {"Partition %d: head %d greater than maximum %d\n", 547}, + {"Partition %d: sector %d greater than maximum %d\n", 548}, + {"Partitions %d: cylinder %d greater than maximum %d\n", 549}, + {"Partition %d: previous sectors %d disagrees with total %d\n", 550}, + {"Warning: bad start-of-data in partition %d\n", 551}, + {"Warning: partition %d overlaps partition %d.\n", 552}, + {"Warning: partition %d is empty\n", 553}, + {"Logical partition %d not entirely in partition %d\n", 554}, + {"Total allocated sectors %d greater than the maximum %lld\n", 555}, + {"%lld unallocated sectors\n", 556}, + {"Partition %d is already defined. Delete it before re-adding it.\n", 557}, + {"First %s", 558}, + {"Sector %d is already allocated\n", 559}, + {"No free sectors available\n", 560}, + {"Last %s or +size or +sizeM or +sizeK", 561}, {"\ \tSorry - this fdisk cannot handle AIX disk labels.\n\ \tIf you want to add DOS-type partitions, create\n\ \ta new empty DOS partition table first. (Use o.)\n\ -\tWARNING: This will destroy the present disk contents.\n", 561}, - {"The maximum number of partitions has been created\n", 562}, - {"You must delete some partition and add an extended partition first\n", 563}, - {"All logical partitions are in use\n", 564}, - {"Adding a primary partition\n", 565}, +\tWARNING: This will destroy the present disk contents.\n", 562}, + {"The maximum number of partitions has been created\n", 563}, + {"You must delete some partition and add an extended partition first\n", 564}, + {"All logical partitions are in use\n", 565}, + {"Adding a primary partition\n", 566}, {"\ Command action\n\ %s\n\ - p primary partition (1-4)\n", 566}, - {"l logical (5 or over)", 567}, - {"e extended", 568}, - {"Invalid partition number for type `%c'\n", 569}, + p primary partition (1-4)\n", 567}, + {"l logical (5 or over)", 568}, + {"e extended", 569}, + {"Invalid partition number for type `%c'\n", 570}, {"\ The partition table has been altered!\n\ -\n", 570}, - {"Calling ioctl() to re-read partition table.\n", 571}, +\n", 571}, + {"Calling ioctl() to re-read partition table.\n", 572}, {"\ \n\ WARNING: Re-reading the partition table failed with error %d: %s.\n\ The kernel still uses the old table.\n\ -The new table will be used at the next reboot.\n", 572}, +The new table will be used at the next reboot.\n", 573}, {"\ \n\ WARNING: If you have created or modified any DOS 6.x\n\ partitions, please see the fdisk manual page for additional\n\ -information.\n", 573}, - {"Syncing disks.\n", 574}, - {"Partition %d has no data area\n", 575}, - {"New beginning of data", 576}, - {"Expert command (m for help): ", 577}, - {"Number of cylinders", 578}, - {"Number of heads", 579}, - {"Number of sectors", 580}, - {"Warning: setting sector offset for DOS compatiblity\n", 581}, - {"Disk %s doesn't contain a valid partition table\n", 582}, - {"Cannot open %s\n", 583}, - {"cannot open %s\n", 584}, - {"%c: unknown command\n", 585}, - {"This kernel finds the sector size itself - -b option ignored\n", 586}, +information.\n", 574}, + {"Syncing disks.\n", 575}, + {"Partition %d has no data area\n", 576}, + {"New beginning of data", 577}, + {"Expert command (m for help): ", 578}, + {"Number of cylinders", 579}, + {"Number of heads", 580}, + {"Number of sectors", 581}, + {"Warning: setting sector offset for DOS compatiblity\n", 582}, + {"Disk %s doesn't contain a valid partition table\n", 583}, + {"Cannot open %s\n", 584}, + {"cannot open %s\n", 585}, + {"%c: unknown command\n", 586}, + {"This kernel finds the sector size itself - -b option ignored\n", 587}, {"\ Warning: the -b (set sector size) option should be used with one specified \ -device\n", 587}, - {"Detected an OSF/1 disklabel on %s, entering disklabel mode.\n", 588}, - {"Command (m for help): ", 589}, +device\n", 588}, + {"Detected an OSF/1 disklabel on %s, entering disklabel mode.\n", 589}, + {"Command (m for help): ", 590}, {"\ \n\ -The current boot file is: %s\n", 590}, - {"Please enter the name of the new boot file: ", 591}, - {"Boot file unchanged\n", 592}, +The current boot file is: %s\n", 591}, + {"Please enter the name of the new boot file: ", 592}, + {"Boot file unchanged\n", 593}, {"\ \n\ \tSorry, no experts menu for SGI partition tables available.\n\ -\n", 593}, +\n", 594}, {"\ \n\ \tThere is a valid AIX label on this disk.\n\ @@ -780,94 +784,94 @@ The current boot file is: %s\n", 590}, \t erase the other disks as well, if unmirrored.)\n\ \t3. Before deleting this physical volume be sure\n\ \t to remove the disk logically from your AIX\n\ -\t machine. (Otherwise you become an AIXpert).", 594}, +\t machine. (Otherwise you become an AIXpert).", 595}, {"\ \n\ -BSD label for device: %s\n", 595}, - {" d delete a BSD partition", 596}, - {" e edit drive data", 597}, - {" i install bootstrap", 598}, - {" l list known filesystem types", 599}, - {" n add a new BSD partition", 600}, - {" p print BSD partition table", 601}, - {" s show complete disklabel", 602}, - {" t change a partition's filesystem id", 603}, - {" u change units (cylinders/sectors)", 604}, - {" w write disklabel to disk", 605}, - {" x link BSD partition to non-BSD partition", 606}, - {"Partition %s has invalid starting sector 0.\n", 607}, - {"Reading disklabel of %s at sector %d.\n", 608}, - {"There is no *BSD partition on %s.\n", 609}, - {"BSD disklabel command (m for help): ", 610}, - {"type: %s\n", 611}, - {"type: %d\n", 612}, - {"disk: %.*s\n", 613}, - {"label: %.*s\n", 614}, - {"flags:", 615}, - {" removable", 616}, - {" ecc", 617}, - {" badsect", 618}, - {"bytes/sector: %ld\n", 619}, - {"sectors/track: %ld\n", 620}, - {"tracks/cylinder: %ld\n", 621}, - {"sectors/cylinder: %ld\n", 622}, - {"cylinders: %ld\n", 623}, - {"rpm: %d\n", 624}, - {"interleave: %d\n", 625}, - {"trackskew: %d\n", 626}, - {"cylinderskew: %d\n", 627}, - {"headswitch: %ld\t\t# milliseconds\n", 628}, - {"track-to-track seek: %ld\t# milliseconds\n", 629}, - {"drivedata: ", 630}, +BSD label for device: %s\n", 596}, + {" d delete a BSD partition", 597}, + {" e edit drive data", 598}, + {" i install bootstrap", 599}, + {" l list known filesystem types", 600}, + {" n add a new BSD partition", 601}, + {" p print BSD partition table", 602}, + {" s show complete disklabel", 603}, + {" t change a partition's filesystem id", 604}, + {" u change units (cylinders/sectors)", 605}, + {" w write disklabel to disk", 606}, + {" x link BSD partition to non-BSD partition", 607}, + {"Partition %s has invalid starting sector 0.\n", 608}, + {"Reading disklabel of %s at sector %d.\n", 609}, + {"There is no *BSD partition on %s.\n", 610}, + {"BSD disklabel command (m for help): ", 611}, + {"type: %s\n", 612}, + {"type: %d\n", 613}, + {"disk: %.*s\n", 614}, + {"label: %.*s\n", 615}, + {"flags:", 616}, + {" removable", 617}, + {" ecc", 618}, + {" badsect", 619}, + {"bytes/sector: %ld\n", 620}, + {"sectors/track: %ld\n", 621}, + {"tracks/cylinder: %ld\n", 622}, + {"sectors/cylinder: %ld\n", 623}, + {"cylinders: %ld\n", 624}, + {"rpm: %d\n", 625}, + {"interleave: %d\n", 626}, + {"trackskew: %d\n", 627}, + {"cylinderskew: %d\n", 628}, + {"headswitch: %ld\t\t# milliseconds\n", 629}, + {"track-to-track seek: %ld\t# milliseconds\n", 630}, + {"drivedata: ", 631}, {"\ \n\ -%d partitions:\n", 631}, - {"# start end size fstype [fsize bsize cpg]\n", 632}, - {"Writing disklabel to %s.\n", 633}, - {"%s contains no disklabel.\n", 634}, - {"Do you want to create a disklabel? (y/n) ", 635}, - {"bytes/sector", 636}, - {"sectors/track", 637}, - {"tracks/cylinder", 638}, - {"sectors/cylinder", 639}, - {"Must be <= sectors/track * tracks/cylinder (default).\n", 640}, - {"rpm", 641}, - {"interleave", 642}, - {"trackskew", 643}, - {"cylinderskew", 644}, - {"headswitch", 645}, - {"track-to-track seek", 646}, - {"Bootstrap: %sboot -> boot%s (%s): ", 647}, - {"Bootstrap overlaps with disk label!\n", 648}, - {"Bootstrap installed on %s.\n", 649}, - {"Partition (a-%c): ", 650}, - {"This partition already exists.\n", 651}, - {"Warning: too many partitions (%d, maximum is %d).\n", 652}, +%d partitions:\n", 632}, + {"# start end size fstype [fsize bsize cpg]\n", 633}, + {"Writing disklabel to %s.\n", 634}, + {"%s contains no disklabel.\n", 635}, + {"Do you want to create a disklabel? (y/n) ", 636}, + {"bytes/sector", 637}, + {"sectors/track", 638}, + {"tracks/cylinder", 639}, + {"sectors/cylinder", 640}, + {"Must be <= sectors/track * tracks/cylinder (default).\n", 641}, + {"rpm", 642}, + {"interleave", 643}, + {"trackskew", 644}, + {"cylinderskew", 645}, + {"headswitch", 646}, + {"track-to-track seek", 647}, + {"Bootstrap: %sboot -> boot%s (%s): ", 648}, + {"Bootstrap overlaps with disk label!\n", 649}, + {"Bootstrap installed on %s.\n", 650}, + {"Partition (a-%c): ", 651}, + {"This partition already exists.\n", 652}, + {"Warning: too many partitions (%d, maximum is %d).\n", 653}, {"\ \n\ -Syncing disks.\n", 653}, - {"SGI volhdr", 654}, - {"SGI trkrepl", 655}, - {"SGI secrepl", 656}, - {"SGI raw", 657}, - {"SGI bsd", 658}, - {"SGI sysv", 659}, - {"SGI volume", 660}, - {"SGI efs", 661}, - {"SGI lvol", 662}, - {"SGI rlvol", 663}, - {"SGI xfs", 664}, - {"SGI xfslog", 665}, - {"SGI xlv", 666}, - {"SGI xvm", 667}, - {"Linux swap", 668}, - {"Linux native", 669}, - {"Linux LVM", 670}, - {"Linux RAID", 671}, +Syncing disks.\n", 654}, + {"SGI volhdr", 655}, + {"SGI trkrepl", 656}, + {"SGI secrepl", 657}, + {"SGI raw", 658}, + {"SGI bsd", 659}, + {"SGI sysv", 660}, + {"SGI volume", 661}, + {"SGI efs", 662}, + {"SGI lvol", 663}, + {"SGI rlvol", 664}, + {"SGI xfs", 665}, + {"SGI xfslog", 666}, + {"SGI xlv", 667}, + {"SGI xvm", 668}, + {"Linux swap", 669}, + {"Linux native", 670}, + {"Linux LVM", 671}, + {"Linux RAID", 672}, {"\ According to MIPS Computer Systems, Inc the Label must not contain more than \ -512 bytes\n", 672}, - {"Detected sgi disklabel with wrong checksum.\n", 673}, +512 bytes\n", 673}, + {"Detected sgi disklabel with wrong checksum.\n", 674}, {"\ \n\ Disk %s (SGI disk label): %d heads, %d sectors\n\ @@ -875,145 +879,145 @@ Disk %s (SGI disk label): %d heads, %d sectors\n\ %d extra sects/cyl, interleave %d:1\n\ %s\n\ Units = %s of %d * 512 bytes\n\ -\n", 674}, +\n", 675}, {"\ \n\ Disk %s (SGI disk label): %d heads, %d sectors, %d cylinders\n\ Units = %s of %d * 512 bytes\n\ -\n", 675}, +\n", 676}, {"\ ----- partitions -----\n\ -Pt# %*s Info Start End Sectors Id System\n", 676}, +Pt# %*s Info Start End Sectors Id System\n", 677}, {"\ ----- Bootinfo -----\n\ Bootfile: %s\n\ ------ Directory Entries -----\n", 677}, - {"%2d: %-10s sector%5u size%8u\n", 678}, +----- Directory Entries -----\n", 678}, + {"%2d: %-10s sector%5u size%8u\n", 679}, {"\ \n\ Invalid Bootfile!\n\ \tThe bootfile must be an absolute non-zero pathname,\n\ -\te.g. \"/unix\" or \"/unix.save\".\n", 679}, +\te.g. \"/unix\" or \"/unix.save\".\n", 680}, {"\ \n\ -\tName of Bootfile too long: 16 bytes maximum.\n", 680}, +\tName of Bootfile too long: 16 bytes maximum.\n", 681}, {"\ \n\ -\tBootfile must have a fully qualified pathname.\n", 681}, +\tBootfile must have a fully qualified pathname.\n", 682}, {"\ \n\ \tBe aware, that the bootfile is not checked for existence.\n\ -\tSGI's default is \"/unix\" and for backup \"/unix.save\".\n", 682}, +\tSGI's default is \"/unix\" and for backup \"/unix.save\".\n", 683}, {"\ \n\ -\tBootfile is changed to \"%s\".\n", 683}, - {"More than one entire disk entry present.\n", 684}, - {"No partitions defined\n", 685}, - {"IRIX likes when Partition 11 covers the entire disk.\n", 686}, +\tBootfile is changed to \"%s\".\n", 684}, + {"More than one entire disk entry present.\n", 685}, + {"No partitions defined\n", 686}, + {"IRIX likes when Partition 11 covers the entire disk.\n", 687}, {"\ The entire disk partition should start at block 0,\n\ -not at diskblock %d.\n", 687}, +not at diskblock %d.\n", 688}, {"\ The entire disk partition is only %d diskblock large,\n\ -but the disk is %d diskblocks long.\n", 688}, - {"One Partition (#11) should cover the entire disk.\n", 689}, - {"Partition %d does not start on cylinder boundary.\n", 690}, - {"Partition %d does not end on cylinder boundary.\n", 691}, - {"The Partition %d and %d overlap by %d sectors.\n", 692}, - {"Unused gap of %8u sectors - sectors %8u-%u\n", 693}, +but the disk is %d diskblocks long.\n", 689}, + {"One Partition (#11) should cover the entire disk.\n", 690}, + {"Partition %d does not start on cylinder boundary.\n", 691}, + {"Partition %d does not end on cylinder boundary.\n", 692}, + {"The Partition %d and %d overlap by %d sectors.\n", 693}, + {"Unused gap of %8u sectors - sectors %8u-%u\n", 694}, {"\ \n\ -The boot partition does not exist.\n", 694}, +The boot partition does not exist.\n", 695}, {"\ \n\ -The swap partition does not exist.\n", 695}, +The swap partition does not exist.\n", 696}, {"\ \n\ -The swap partition has no swap type.\n", 696}, - {"\tYou have chosen an unusual boot file name.\n", 697}, - {"Sorry You may change the Tag of non-empty partitions.\n", 698}, +The swap partition has no swap type.\n", 697}, + {"\tYou have chosen an unusual boot file name.\n", 698}, + {"Sorry You may change the Tag of non-empty partitions.\n", 699}, {"\ It is highly recommended that the partition at offset 0\n\ is of type \"SGI volhdr\", the IRIX system will rely on it to\n\ retrieve from its directory standalone tools like sash and fx.\n\ Only the \"SGI volume\" entire disk section may violate this.\n\ -Type YES if you are sure about tagging this partition differently.\n", 699}, - {"YES\n", 700}, - {"Do You know, You got a partition overlap on the disk?\n", 701}, - {"Attempting to generate entire disk entry automatically.\n", 702}, - {"The entire disk is already covered with partitions.\n", 703}, - {"You got a partition overlap on the disk. Fix it first!\n", 704}, +Type YES if you are sure about tagging this partition differently.\n", 700}, + {"YES\n", 701}, + {"Do You know, You got a partition overlap on the disk?\n", 702}, + {"Attempting to generate entire disk entry automatically.\n", 703}, + {"The entire disk is already covered with partitions.\n", 704}, + {"You got a partition overlap on the disk. Fix it first!\n", 705}, {"\ It is highly recommended that eleventh partition\n\ -covers the entire disk and is of type `SGI volume'\n", 705}, - {"You will get a partition overlap on the disk. Fix it first!\n", 706}, - {" Last %s", 707}, +covers the entire disk and is of type `SGI volume'\n", 706}, + {"You will get a partition overlap on the disk. Fix it first!\n", 707}, + {" Last %s", 708}, {"\ Building a new SGI disklabel. Changes will remain in memory only,\n\ until you decide to write them. After that, of course, the previous\n\ content will be unrecoverably lost.\n\ -\n", 708}, +\n", 709}, {"\ Warning: BLKGETSIZE ioctl failed on %s. Using geometry cylinder value of %\ d.\n\ -This value may be truncated for devices > 33.8 GB.\n", 709}, - {"Trying to keep parameters of partition %d.\n", 710}, - {"ID=%02x\tSTART=%d\tLENGTH=%d\n", 711}, - {"Empty", 712}, - {"SunOS root", 713}, - {"SunOS swap", 714}, - {"SunOS usr", 715}, - {"Whole disk", 716}, - {"SunOS stand", 717}, - {"SunOS var", 718}, - {"SunOS home", 719}, - {"Linux raid autodetect", 720}, +This value may be truncated for devices > 33.8 GB.\n", 710}, + {"Trying to keep parameters of partition %d.\n", 711}, + {"ID=%02x\tSTART=%d\tLENGTH=%d\n", 712}, + {"Empty", 713}, + {"SunOS root", 714}, + {"SunOS swap", 715}, + {"SunOS usr", 716}, + {"Whole disk", 717}, + {"SunOS stand", 718}, + {"SunOS var", 719}, + {"SunOS home", 720}, + {"Linux raid autodetect", 721}, {"\ Detected sun disklabel with wrong checksum.\n\ Probably you'll have to set all the values,\n\ e.g. heads, sectors, cylinders and partitions\n\ -or force a fresh label (s command in main menu)\n", 721}, - {"Autoconfigure found a %s%s%s\n", 722}, +or force a fresh label (s command in main menu)\n", 722}, + {"Autoconfigure found a %s%s%s\n", 723}, {"\ Building a new sun disklabel. Changes will remain in memory only,\n\ until you decide to write them. After that, of course, the previous\n\ content won't be recoverable.\n\ -\n", 723}, +\n", 724}, {"\ Drive type\n\ ? auto configure\n\ - 0 custom (with hardware detected defaults)", 724}, - {"Select type (? for auto, 0 for custom): ", 725}, - {"Autoconfigure failed.\n", 726}, - {"Sectors/track", 727}, - {"Alternate cylinders", 728}, - {"Physical cylinders", 729}, - {"Rotation speed (rpm)", 730}, - {"Interleave factor", 731}, - {"Extra sectors per cylinder", 732}, - {"You may change all the disk params from the x menu", 733}, - {"3,5\" floppy", 734}, - {"Linux custom", 735}, - {"Partition %d doesn't end on cylinder boundary\n", 736}, - {"Partition %d overlaps with others in sectors %d-%d\n", 737}, - {"Unused gap - sectors 0-%d\n", 738}, - {"Unused gap - sectors %d-%d\n", 739}, + 0 custom (with hardware detected defaults)", 725}, + {"Select type (? for auto, 0 for custom): ", 726}, + {"Autoconfigure failed.\n", 727}, + {"Sectors/track", 728}, + {"Alternate cylinders", 729}, + {"Physical cylinders", 730}, + {"Rotation speed (rpm)", 731}, + {"Interleave factor", 732}, + {"Extra sectors per cylinder", 733}, + {"You may change all the disk params from the x menu", 734}, + {"3,5\" floppy", 735}, + {"Linux custom", 736}, + {"Partition %d doesn't end on cylinder boundary\n", 737}, + {"Partition %d overlaps with others in sectors %d-%d\n", 738}, + {"Unused gap - sectors 0-%d\n", 739}, + {"Unused gap - sectors %d-%d\n", 740}, {"\ Other partitions already cover the whole disk.\n\ -Delete some/shrink them before retry.\n", 740}, +Delete some/shrink them before retry.\n", 741}, {"\ You haven't covered the whole disk with the 3rd partition, but your value\n\ %d %s covers some other partition. Your entry has been changed\n\ -to %d %s\n", 741}, +to %d %s\n", 742}, {"\ If you want to maintain SunOS/Solaris compatibility, consider leaving this\n\ -partition as Whole disk (5), starting at 0, with %u sectors\n", 742}, +partition as Whole disk (5), starting at 0, with %u sectors\n", 743}, {"\ It is highly recommended that the partition at offset 0\n\ is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n\ there may destroy your partition table and bootblock.\n\ Type YES if you're very sure you would like that partition\n\ -tagged with 82 (Linux swap): ", 743}, +tagged with 82 (Linux swap): ", 744}, {"\ \n\ Disk %s (Sun disk label): %d heads, %d sectors, %d rpm\n\ @@ -1021,462 +1025,463 @@ Disk %s (Sun disk label): %d heads, %d sectors, %d rpm\n\ %d extra sects/cyl, interleave %d:1\n\ %s\n\ Units = %s of %d * 512 bytes\n\ -\n", 744}, +\n", 745}, {"\ \n\ Disk %s (Sun disk label): %d heads, %d sectors, %d cylinders\n\ Units = %s of %d * 512 bytes\n\ -\n", 745}, - {"%*s Flag Start End Blocks Id System\n", 746}, - {"Number of alternate cylinders", 747}, - {"Number of physical cylinders", 748}, - {"FAT12", 749}, - {"XENIX root", 750}, - {"XENIX usr", 751}, - {"FAT16 <32M", 752}, - {"Extended", 753}, - {"FAT16", 754}, - {"HPFS/NTFS", 755}, - {"AIX", 756}, - {"AIX bootable", 757}, - {"OS/2 Boot Manager", 758}, - {"W95 FAT32", 759}, - {"W95 FAT32 (LBA)", 760}, - {"W95 FAT16 (LBA)", 761}, - {"W95 Ext'd (LBA)", 762}, - {"OPUS", 763}, - {"Hidden FAT12", 764}, - {"Compaq diagnostics", 765}, - {"Hidden FAT16 <32M", 766}, - {"Hidden FAT16", 767}, - {"Hidden HPFS/NTFS", 768}, - {"AST SmartSleep", 769}, - {"Hidden W95 FAT32", 770}, - {"Hidden W95 FAT32 (LBA)", 771}, - {"Hidden W95 FAT16 (LBA)", 772}, - {"NEC DOS", 773}, - {"Plan 9", 774}, - {"PartitionMagic recovery", 775}, - {"Venix 80286", 776}, - {"PPC PReP Boot", 777}, - {"SFS", 778}, - {"QNX4.x", 779}, - {"QNX4.x 2nd part", 780}, - {"QNX4.x 3rd part", 781}, - {"OnTrack DM", 782}, - {"OnTrack DM6 Aux1", 783}, - {"CP/M", 784}, - {"OnTrack DM6 Aux3", 785}, - {"OnTrackDM6", 786}, - {"EZ-Drive", 787}, - {"Golden Bow", 788}, - {"Priam Edisk", 789}, - {"SpeedStor", 790}, - {"GNU HURD or SysV", 791}, - {"Novell Netware 286", 792}, - {"Novell Netware 386", 793}, - {"DiskSecure Multi-Boot", 794}, - {"PC/IX", 795}, - {"Old Minix", 796}, - {"Minix / old Linux", 797}, - {"Linux swap / Solaris", 798}, - {"OS/2 hidden C: drive", 799}, - {"Linux extended", 800}, - {"NTFS volume set", 801}, - {"Amoeba", 802}, - {"Amoeba BBT", 803}, - {"BSD/OS", 804}, - {"IBM Thinkpad hibernation", 805}, - {"FreeBSD", 806}, - {"OpenBSD", 807}, - {"NeXTSTEP", 808}, - {"Darwin UFS", 809}, - {"NetBSD", 810}, - {"Darwin boot", 811}, - {"BSDI fs", 812}, - {"BSDI swap", 813}, - {"Boot Wizard hidden", 814}, - {"Solaris boot", 815}, - {"DRDOS/sec (FAT-12)", 816}, - {"DRDOS/sec (FAT-16 < 32M)", 817}, - {"DRDOS/sec (FAT-16)", 818}, - {"Syrinx", 819}, - {"Non-FS data", 820}, - {"CP/M / CTOS / ...", 821}, - {"Dell Utility", 822}, - {"BootIt", 823}, - {"DOS access", 824}, - {"DOS R/O", 825}, - {"BeOS fs", 826}, - {"EFI GPT", 827}, - {"EFI (FAT-12/16/32)", 828}, - {"Linux/PA-RISC boot", 829}, - {"DOS secondary", 830}, - {"LANstep", 831}, - {"BBT", 832}, - {"seek error on %s - cannot seek to %lu\n", 833}, - {"seek error: wanted 0x%08x%08x, got 0x%08x%08x\n", 834}, - {"out of memory - giving up\n", 835}, - {"read error on %s - cannot read sector %lu\n", 836}, - {"ERROR: sector %lu does not have an msdos signature\n", 837}, - {"write error on %s - cannot write sector %lu\n", 838}, - {"cannot open partition sector save file (%s)\n", 839}, - {"write error on %s\n", 840}, - {"cannot stat partition restore file (%s)\n", 841}, - {"partition restore file has wrong size - not restoring\n", 842}, - {"out of memory?\n", 843}, - {"cannot open partition restore file (%s)\n", 844}, - {"error reading %s\n", 845}, - {"cannot open device %s for writing\n", 846}, - {"error writing sector %lu on %s\n", 847}, - {"Disk %s: cannot get geometry\n", 848}, - {"Disk %s: cannot get size\n", 849}, +\n", 746}, + {"%*s Flag Start End Blocks Id System\n", 747}, + {"Number of alternate cylinders", 748}, + {"Number of physical cylinders", 749}, + {"FAT12", 750}, + {"XENIX root", 751}, + {"XENIX usr", 752}, + {"FAT16 <32M", 753}, + {"Extended", 754}, + {"FAT16", 755}, + {"HPFS/NTFS", 756}, + {"AIX", 757}, + {"AIX bootable", 758}, + {"OS/2 Boot Manager", 759}, + {"W95 FAT32", 760}, + {"W95 FAT32 (LBA)", 761}, + {"W95 FAT16 (LBA)", 762}, + {"W95 Ext'd (LBA)", 763}, + {"OPUS", 764}, + {"Hidden FAT12", 765}, + {"Compaq diagnostics", 766}, + {"Hidden FAT16 <32M", 767}, + {"Hidden FAT16", 768}, + {"Hidden HPFS/NTFS", 769}, + {"AST SmartSleep", 770}, + {"Hidden W95 FAT32", 771}, + {"Hidden W95 FAT32 (LBA)", 772}, + {"Hidden W95 FAT16 (LBA)", 773}, + {"NEC DOS", 774}, + {"Plan 9", 775}, + {"PartitionMagic recovery", 776}, + {"Venix 80286", 777}, + {"PPC PReP Boot", 778}, + {"SFS", 779}, + {"QNX4.x", 780}, + {"QNX4.x 2nd part", 781}, + {"QNX4.x 3rd part", 782}, + {"OnTrack DM", 783}, + {"OnTrack DM6 Aux1", 784}, + {"CP/M", 785}, + {"OnTrack DM6 Aux3", 786}, + {"OnTrackDM6", 787}, + {"EZ-Drive", 788}, + {"Golden Bow", 789}, + {"Priam Edisk", 790}, + {"SpeedStor", 791}, + {"GNU HURD or SysV", 792}, + {"Novell Netware 286", 793}, + {"Novell Netware 386", 794}, + {"DiskSecure Multi-Boot", 795}, + {"PC/IX", 796}, + {"Old Minix", 797}, + {"Minix / old Linux", 798}, + {"Linux swap / Solaris", 799}, + {"OS/2 hidden C: drive", 800}, + {"Linux extended", 801}, + {"NTFS volume set", 802}, + {"Amoeba", 803}, + {"Amoeba BBT", 804}, + {"BSD/OS", 805}, + {"IBM Thinkpad hibernation", 806}, + {"FreeBSD", 807}, + {"OpenBSD", 808}, + {"NeXTSTEP", 809}, + {"Darwin UFS", 810}, + {"NetBSD", 811}, + {"Darwin boot", 812}, + {"BSDI fs", 813}, + {"BSDI swap", 814}, + {"Boot Wizard hidden", 815}, + {"Solaris boot", 816}, + {"Solaris", 817}, + {"DRDOS/sec (FAT-12)", 818}, + {"DRDOS/sec (FAT-16 < 32M)", 819}, + {"DRDOS/sec (FAT-16)", 820}, + {"Syrinx", 821}, + {"Non-FS data", 822}, + {"CP/M / CTOS / ...", 823}, + {"Dell Utility", 824}, + {"BootIt", 825}, + {"DOS access", 826}, + {"DOS R/O", 827}, + {"BeOS fs", 828}, + {"EFI GPT", 829}, + {"EFI (FAT-12/16/32)", 830}, + {"Linux/PA-RISC boot", 831}, + {"DOS secondary", 832}, + {"LANstep", 833}, + {"BBT", 834}, + {"seek error on %s - cannot seek to %lu\n", 835}, + {"seek error: wanted 0x%08x%08x, got 0x%08x%08x\n", 836}, + {"out of memory - giving up\n", 837}, + {"read error on %s - cannot read sector %lu\n", 838}, + {"ERROR: sector %lu does not have an msdos signature\n", 839}, + {"write error on %s - cannot write sector %lu\n", 840}, + {"cannot open partition sector save file (%s)\n", 841}, + {"write error on %s\n", 842}, + {"cannot stat partition restore file (%s)\n", 843}, + {"partition restore file has wrong size - not restoring\n", 844}, + {"out of memory?\n", 845}, + {"cannot open partition restore file (%s)\n", 846}, + {"error reading %s\n", 847}, + {"cannot open device %s for writing\n", 848}, + {"error writing sector %lu on %s\n", 849}, + {"Disk %s: cannot get geometry\n", 850}, + {"Disk %s: cannot get size\n", 851}, {"\ Warning: start=%lu - this looks like a partition rather than\n\ the entire disk. Using fdisk on it is probably meaningless.\n\ -[Use the --force option if you really want this]\n", 850}, - {"Warning: HDIO_GETGEO says that there are %lu heads\n", 851}, - {"Warning: HDIO_GETGEO says that there are %lu sectors\n", 852}, - {"Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n", 853}, +[Use the --force option if you really want this]\n", 852}, + {"Warning: HDIO_GETGEO says that there are %lu heads\n", 853}, + {"Warning: HDIO_GETGEO says that there are %lu sectors\n", 854}, + {"Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n", 855}, {"\ Warning: unlikely number of sectors (%lu) - usually at most 63\n\ -This will give problems with all software that uses C/H/S addressing.\n", 854}, +This will give problems with all software that uses C/H/S addressing.\n", 856}, {"\ \n\ -Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n", 855}, +Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n", 857}, {"\ -%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n", 856}, +%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n", 858}, {"\ %s of partition %s has impossible value for sector: %lu (should be in 1-%\ -lu)\n", 857}, +lu)\n", 859}, {"\ %s of partition %s has impossible value for cylinders: %lu (should be in 0-%\ -lu)\n", 858}, +lu)\n", 860}, {"\ Id Name\n\ -\n", 859}, - {"Re-reading the partition table ...\n", 860}, +\n", 861}, + {"Re-reading the partition table ...\n", 862}, {"\ The command to re-read the partition table failed\n\ -Reboot your system now, before using mkfs\n", 861}, - {"Error closing %s\n", 862}, - {"%s: no such partition\n", 863}, - {"unrecognized format - using sectors\n", 864}, - {"# partition table of %s\n", 865}, - {"unimplemented format - using %s\n", 866}, +Reboot your system now, before using mkfs\n", 863}, + {"Error closing %s\n", 864}, + {"%s: no such partition\n", 865}, + {"unrecognized format - using sectors\n", 866}, + {"# partition table of %s\n", 867}, + {"unimplemented format - using %s\n", 868}, {"\ Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n\ -\n", 867}, - {" Device Boot Start End #cyls #blocks Id System\n", 868}, +\n", 869}, + {" Device Boot Start End #cyls #blocks Id System\n", 870}, {"\ Units = sectors of 512 bytes, counting from %d\n\ -\n", 869}, - {" Device Boot Start End #sectors Id System\n", 870}, +\n", 871}, + {" Device Boot Start End #sectors Id System\n", 872}, {"\ Units = blocks of 1024 bytes, counting from %d\n\ -\n", 871}, - {" Device Boot Start End #blocks Id System\n", 872}, +\n", 873}, + {" Device Boot Start End #blocks Id System\n", 874}, {"\ Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n\ -\n", 873}, - {" Device Boot Start End MiB #blocks Id System\n", 874}, - {"\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 875}, - {"\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 876}, - {"partition ends on cylinder %ld, beyond the end of the disk\n", 877}, - {"No partitions found\n", 878}, +\n", 875}, + {" Device Boot Start End MiB #blocks Id System\n", 876}, + {"\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 877}, + {"\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 878}, + {"partition ends on cylinder %ld, beyond the end of the disk\n", 879}, + {"No partitions found\n", 880}, {"\ Warning: The partition table looks like it was made\n\ for C/H/S=*/%ld/%ld (instead of %ld/%ld/%ld).\n\ -For this listing I'll assume that geometry.\n", 879}, - {"no partition table present.\n", 880}, - {"strange, only %d partitions defined.\n", 881}, - {"Warning: partition %s has size 0 but is not marked Empty\n", 882}, - {"Warning: partition %s has size 0 and is bootable\n", 883}, - {"Warning: partition %s has size 0 and nonzero start\n", 884}, - {"Warning: partition %s ", 885}, - {"is not contained in partition %s\n", 886}, - {"Warning: partitions %s ", 887}, - {"and %s overlap\n", 888}, +For this listing I'll assume that geometry.\n", 881}, + {"no partition table present.\n", 882}, + {"strange, only %d partitions defined.\n", 883}, + {"Warning: partition %s has size 0 but is not marked Empty\n", 884}, + {"Warning: partition %s has size 0 and is bootable\n", 885}, + {"Warning: partition %s has size 0 and nonzero start\n", 886}, + {"Warning: partition %s ", 887}, + {"is not contained in partition %s\n", 888}, + {"Warning: partitions %s ", 889}, + {"and %s overlap\n", 890}, {"\ Warning: partition %s contains part of the partition table (sector %lu),\n\ -and will destroy it when filled\n", 889}, - {"Warning: partition %s starts at sector 0\n", 890}, - {"Warning: partition %s extends past end of disk\n", 891}, +and will destroy it when filled\n", 891}, + {"Warning: partition %s starts at sector 0\n", 892}, + {"Warning: partition %s extends past end of disk\n", 893}, {"\ Among the primary partitions, at most one can be extended\n\ - (although this is not a problem under Linux)\n", 892}, - {"Warning: partition %s does not start at a cylinder boundary\n", 893}, - {"Warning: partition %s does not end at a cylinder boundary\n", 894}, + (although this is not a problem under Linux)\n", 894}, + {"Warning: partition %s does not start at a cylinder boundary\n", 895}, + {"Warning: partition %s does not end at a cylinder boundary\n", 896}, {"\ Warning: more than one primary partition is marked bootable (active)\n\ -This does not matter for LILO, but the DOS MBR will not boot this disk.\n", 895}, +This does not matter for LILO, but the DOS MBR will not boot this disk.\n", 897}, {"\ Warning: usually one can boot from primary partitions only\n\ -LILO disregards the `bootable' flag.\n", 896}, +LILO disregards the `bootable' flag.\n", 898}, {"\ Warning: no primary partition is marked bootable (active)\n\ -This does not matter for LILO, but the DOS MBR will not boot this disk.\n", 897}, - {"start", 898}, +This does not matter for LILO, but the DOS MBR will not boot this disk.\n", 899}, + {"start", 900}, {"\ -partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 899}, - {"end", 900}, - {"partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 901}, - {"partition %s ends on cylinder %ld, beyond the end of the disk\n", 902}, +partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 901}, + {"end", 902}, + {"partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 903}, + {"partition %s ends on cylinder %ld, beyond the end of the disk\n", 904}, {"\ Warning: shifted start of the extd partition from %ld to %ld\n\ -(For listing purposes only. Do not change its contents.)\n", 903}, +(For listing purposes only. Do not change its contents.)\n", 905}, {"\ Warning: extended partition does not start at a cylinder boundary.\n\ -DOS and Linux will interpret the contents differently.\n", 904}, - {"too many partitions - ignoring those past nr (%d)\n", 905}, - {"tree of partitions?\n", 906}, - {"detected Disk Manager - unable to handle that\n", 907}, - {"DM6 signature found - giving up\n", 908}, - {"strange..., an extended partition of size 0?\n", 909}, - {"strange..., a BSD partition of size 0?\n", 910}, - {" %s: unrecognized partition table type\n", 911}, - {"-n flag was given: Nothing changed\n", 912}, - {"Failed saving the old sectors - aborting\n", 913}, - {"Failed writing the partition on %s\n", 914}, - {"long or incomplete input line - quitting\n", 915}, - {"input error: `=' expected after %s field\n", 916}, - {"input error: unexpected character %c after %s field\n", 917}, - {"unrecognized input: %s\n", 918}, - {"number too big\n", 919}, - {"trailing junk after number\n", 920}, - {"no room for partition descriptor\n", 921}, - {"cannot build surrounding extended partition\n", 922}, - {"too many input fields\n", 923}, - {"No room for more\n", 924}, - {"Illegal type\n", 925}, - {"Warning: given size (%lu) exceeds max allowable size (%lu)\n", 926}, - {"Warning: empty partition\n", 927}, - {"Warning: bad partition start (earliest %lu)\n", 928}, - {"unrecognized bootable flag - choose - or *\n", 929}, - {"partial c,h,s specification?\n", 930}, - {"Extended partition not where expected\n", 931}, - {"bad input\n", 932}, - {"too many partitions\n", 933}, +DOS and Linux will interpret the contents differently.\n", 906}, + {"too many partitions - ignoring those past nr (%d)\n", 907}, + {"tree of partitions?\n", 908}, + {"detected Disk Manager - unable to handle that\n", 909}, + {"DM6 signature found - giving up\n", 910}, + {"strange..., an extended partition of size 0?\n", 911}, + {"strange..., a BSD partition of size 0?\n", 912}, + {" %s: unrecognized partition table type\n", 913}, + {"-n flag was given: Nothing changed\n", 914}, + {"Failed saving the old sectors - aborting\n", 915}, + {"Failed writing the partition on %s\n", 916}, + {"long or incomplete input line - quitting\n", 917}, + {"input error: `=' expected after %s field\n", 918}, + {"input error: unexpected character %c after %s field\n", 919}, + {"unrecognized input: %s\n", 920}, + {"number too big\n", 921}, + {"trailing junk after number\n", 922}, + {"no room for partition descriptor\n", 923}, + {"cannot build surrounding extended partition\n", 924}, + {"too many input fields\n", 925}, + {"No room for more\n", 926}, + {"Illegal type\n", 927}, + {"Warning: given size (%lu) exceeds max allowable size (%lu)\n", 928}, + {"Warning: empty partition\n", 929}, + {"Warning: bad partition start (earliest %lu)\n", 930}, + {"unrecognized bootable flag - choose - or *\n", 931}, + {"partial c,h,s specification?\n", 932}, + {"Extended partition not where expected\n", 933}, + {"bad input\n", 934}, + {"too many partitions\n", 935}, {"\ Input in the following format; absent fields get a default value.\n\ \n\ -Usually you only need to specify and (and perhaps ).\n", 934}, - {"version", 935}, - {"Usage: %s [options] device ...\n", 936}, - {"device: something like /dev/hda or /dev/sda", 937}, - {"useful options:", 938}, - {" -s [or --show-size]: list size of a partition", 939}, - {" -c [or --id]: print or change partition Id", 940}, - {" -l [or --list]: list partitions of each device", 941}, - {" -d [or --dump]: idem, but in a format suitable for later input", 942}, - {" -i [or --increment]: number cylinders etc. from 1 instead of from 0", 943}, +Usually you only need to specify and (and perhaps ).\n", 936}, + {"version", 937}, + {"Usage: %s [options] device ...\n", 938}, + {"device: something like /dev/hda or /dev/sda", 939}, + {"useful options:", 940}, + {" -s [or --show-size]: list size of a partition", 941}, + {" -c [or --id]: print or change partition Id", 942}, + {" -l [or --list]: list partitions of each device", 943}, + {" -d [or --dump]: idem, but in a format suitable for later input", 944}, + {" -i [or --increment]: number cylinders etc. from 1 instead of from 0", 945}, {"\ -uS, -uB, -uC, -uM: accept/report in units of sectors/blocks/cylinders/\ -MB", 944}, - {" -T [or --list-types]:list the known partition types", 945}, - {" -D [or --DOS]: for DOS-compatibility: waste a little space", 946}, - {" -R [or --re-read]: make kernel reread partition table", 947}, - {" -N# : change only the partition with number #", 948}, - {" -n : do not actually write to disk", 949}, - {"\ - -O file : save the sectors that will be overwritten to file", 950}, - {" -I file : restore these sectors again", 951}, - {" -v [or --version]: print version", 952}, - {" -? [or --help]: print this message", 953}, - {"dangerous options:", 954}, - {" -g [or --show-geometry]: print the kernel's idea of the geometry", 955}, +MB", 946}, + {" -T [or --list-types]:list the known partition types", 947}, + {" -D [or --DOS]: for DOS-compatibility: waste a little space", 948}, + {" -R [or --re-read]: make kernel reread partition table", 949}, + {" -N# : change only the partition with number #", 950}, + {" -n : do not actually write to disk", 951}, + {"\ + -O file : save the sectors that will be overwritten to file", 952}, + {" -I file : restore these sectors again", 953}, + {" -v [or --version]: print version", 954}, + {" -? [or --help]: print this message", 955}, + {"dangerous options:", 956}, + {" -g [or --show-geometry]: print the kernel's idea of the geometry", 957}, {"\ -x [or --show-extended]: also list extended partitions on output\n\ - or expect descriptors for them on input", 956}, - {"\ - -L [or --Linux]: do not complain about things irrelevant for Linux", 957}, - {" -q [or --quiet]: suppress warning messages", 958}, - {" You can override the detected geometry using:", 959}, - {" -C# [or --cylinders #]:set the number of cylinders to use", 960}, - {" -H# [or --heads #]: set the number of heads to use", 961}, - {" -S# [or --sectors #]: set the number of sectors to use", 962}, - {"You can disable all consistency checking with:", 963}, - {" -f [or --force]: do what I say, even if it is stupid", 964}, - {"Usage:", 965}, - {"%s device\t\t list active partitions on device\n", 966}, - {"%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n", 967}, - {"%s -An device\t activate partition n, inactivate the other ones\n", 968}, - {"no command?\n", 969}, - {"total: %llu blocks\n", 970}, - {"usage: sfdisk --print-id device partition-number\n", 971}, - {"usage: sfdisk --change-id device partition-number Id\n", 972}, - {"usage: sfdisk --id device partition-number [Id]\n", 973}, - {"can specify only one device (except with -l or -s)\n", 974}, - {"cannot open %s read-write\n", 975}, - {"cannot open %s for reading\n", 976}, - {"%s: OK\n", 977}, - {"%s: %ld cylinders, %ld heads, %ld sectors/track\n", 978}, - {"Cannot get size of %s\n", 979}, - {"bad active byte: 0x%x instead of 0x80\n", 980}, + or expect descriptors for them on input", 958}, + {"\ + -L [or --Linux]: do not complain about things irrelevant for Linux", 959}, + {" -q [or --quiet]: suppress warning messages", 960}, + {" You can override the detected geometry using:", 961}, + {" -C# [or --cylinders #]:set the number of cylinders to use", 962}, + {" -H# [or --heads #]: set the number of heads to use", 963}, + {" -S# [or --sectors #]: set the number of sectors to use", 964}, + {"You can disable all consistency checking with:", 965}, + {" -f [or --force]: do what I say, even if it is stupid", 966}, + {"Usage:", 967}, + {"%s device\t\t list active partitions on device\n", 968}, + {"%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n", 969}, + {"%s -An device\t activate partition n, inactivate the other ones\n", 970}, + {"no command?\n", 971}, + {"total: %llu blocks\n", 972}, + {"usage: sfdisk --print-id device partition-number\n", 973}, + {"usage: sfdisk --change-id device partition-number Id\n", 974}, + {"usage: sfdisk --id device partition-number [Id]\n", 975}, + {"can specify only one device (except with -l or -s)\n", 976}, + {"cannot open %s read-write\n", 977}, + {"cannot open %s for reading\n", 978}, + {"%s: OK\n", 979}, + {"%s: %ld cylinders, %ld heads, %ld sectors/track\n", 980}, + {"Cannot get size of %s\n", 981}, + {"bad active byte: 0x%x instead of 0x80\n", 982}, {"\ Done\n\ -\n", 981}, +\n", 983}, {"\ You have %d active primary partitions. This does not matter for LILO,\n\ -but the DOS MBR will only boot a disk with 1 active partition.\n", 982}, - {"partition %s has id %x and is not hidden\n", 983}, - {"Bad Id %lx\n", 984}, - {"This disk is currently in use.\n", 985}, - {"Fatal error: cannot find %s\n", 986}, - {"Warning: %s is not a block device\n", 987}, - {"Checking that no-one is using this disk right now ...\n", 988}, +but the DOS MBR will only boot a disk with 1 active partition.\n", 984}, + {"partition %s has id %x and is not hidden\n", 985}, + {"Bad Id %lx\n", 986}, + {"This disk is currently in use.\n", 987}, + {"Fatal error: cannot find %s\n", 988}, + {"Warning: %s is not a block device\n", 989}, + {"Checking that no-one is using this disk right now ...\n", 990}, {"\ \n\ This disk is currently in use - repartitioning is probably a bad idea.\n\ Umount all file systems, and swapoff all swap partitions on this disk.\n\ -Use the --no-reread flag to suppress this check.\n", 989}, - {"Use the --force flag to overrule all checks.\n", 990}, - {"OK\n", 991}, - {"Old situation:\n", 992}, - {"Partition %d does not exist, cannot change it\n", 993}, - {"New situation:\n", 994}, +Use the --no-reread flag to suppress this check.\n", 991}, + {"Use the --force flag to overrule all checks.\n", 992}, + {"OK\n", 993}, + {"Old situation:\n", 994}, + {"Partition %d does not exist, cannot change it\n", 995}, + {"New situation:\n", 996}, {"\ I don't like these partitions - nothing changed.\n\ -(If you really want this, use the --force option.)\n", 995}, - {"I don't like this - probably you should answer No\n", 996}, - {"Are you satisfied with this? [ynq] ", 997}, - {"Do you want to write this to disk? [ynq] ", 998}, +(If you really want this, use the --force option.)\n", 997}, + {"I don't like this - probably you should answer No\n", 998}, + {"Are you satisfied with this? [ynq] ", 999}, + {"Do you want to write this to disk? [ynq] ", 1000}, {"\ \n\ -sfdisk: premature end of input\n", 999}, - {"Quitting - nothing changed\n", 1000}, - {"Please answer one of y,n,q\n", 1001}, +sfdisk: premature end of input\n", 1001}, + {"Quitting - nothing changed\n", 1002}, + {"Please answer one of y,n,q\n", 1003}, {"\ Successfully wrote the new partition table\n\ -\n", 1002}, +\n", 1004}, {"\ If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n\ to zero the first 512 bytes: dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n\ -(See fdisk(8).)\n", 1003}, - {"Try `getopt --help' for more information.\n", 1004}, - {"empty long option after -l or --long argument", 1005}, - {"unknown shell after -s or --shell argument", 1006}, - {"Usage: getopt optstring parameters\n", 1007}, - {" getopt [options] [--] optstring parameters\n", 1008}, - {" getopt [options] -o|--options optstring [options] [--]\n", 1009}, - {" parameters\n", 1010}, - {"\ - -a, --alternative Allow long options starting with single -\n", 1011}, - {" -h, --help This small usage guide\n", 1012}, - {" -l, --longoptions=longopts Long options to be recognized\n", 1013}, - {"\ - -n, --name=progname The name under which errors are reported\n", 1014}, - {" -o, --options=optstring Short options to be recognized\n", 1015}, - {" -q, --quiet Disable error reporting by getopt(3)\n", 1016}, - {" -Q, --quiet-output No normal output\n", 1017}, - {" -s, --shell=shell Set shell quoting conventions\n", 1018}, - {" -T, --test Test for getopt(1) version\n", 1019}, - {" -u, --unqote Do not quote the output\n", 1020}, - {" -V, --version Output version information\n", 1021}, - {"missing optstring argument", 1022}, - {"getopt (enhanced) 1.1.3\n", 1023}, - {"internal error, contact the author.", 1024}, - {"booted from MILO\n", 1025}, - {"Ruffian BCD clock\n", 1026}, - {"clockport adjusted to 0x%x\n", 1027}, - {"funky TOY!\n", 1028}, - {"%s: atomic %s failed for 1000 iterations!", 1029}, - {"Cannot open /dev/port: %s", 1030}, - {"I failed to get permission because I didn't try.\n", 1031}, - {"%s is unable to get I/O port access: the iopl(3) call failed.\n", 1032}, - {"Probably you need root privileges.\n", 1033}, - {"Assuming hardware clock is kept in %s time.\n", 1034}, - {"UTC", 1035}, - {"local", 1036}, - {"%s: Warning: unrecognized third line in adjtime file\n", 1037}, - {"(Expected: `UTC' or `LOCAL' or nothing.)\n", 1038}, - {"Last drift adjustment done at %ld seconds after 1969\n", 1039}, - {"Last calibration done at %ld seconds after 1969\n", 1040}, - {"Hardware clock is on %s time\n", 1041}, - {"unknown", 1042}, - {"Waiting for clock tick...\n", 1043}, - {"...got clock tick\n", 1044}, - {"Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n", 1045}, - {"Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n", 1046}, - {"Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n", 1047}, - {"Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n", 1048}, - {"Clock not changed - testing only.\n", 1049}, +(See fdisk(8).)\n", 1005}, + {"Try `getopt --help' for more information.\n", 1006}, + {"empty long option after -l or --long argument", 1007}, + {"unknown shell after -s or --shell argument", 1008}, + {"Usage: getopt optstring parameters\n", 1009}, + {" getopt [options] [--] optstring parameters\n", 1010}, + {" getopt [options] -o|--options optstring [options] [--]\n", 1011}, + {" parameters\n", 1012}, + {"\ + -a, --alternative Allow long options starting with single -\n", 1013}, + {" -h, --help This small usage guide\n", 1014}, + {" -l, --longoptions=longopts Long options to be recognized\n", 1015}, + {"\ + -n, --name=progname The name under which errors are reported\n", 1016}, + {" -o, --options=optstring Short options to be recognized\n", 1017}, + {" -q, --quiet Disable error reporting by getopt(3)\n", 1018}, + {" -Q, --quiet-output No normal output\n", 1019}, + {" -s, --shell=shell Set shell quoting conventions\n", 1020}, + {" -T, --test Test for getopt(1) version\n", 1021}, + {" -u, --unqote Do not quote the output\n", 1022}, + {" -V, --version Output version information\n", 1023}, + {"missing optstring argument", 1024}, + {"getopt (enhanced) 1.1.3\n", 1025}, + {"internal error, contact the author.", 1026}, + {"booted from MILO\n", 1027}, + {"Ruffian BCD clock\n", 1028}, + {"clockport adjusted to 0x%x\n", 1029}, + {"funky TOY!\n", 1030}, + {"%s: atomic %s failed for 1000 iterations!", 1031}, + {"Cannot open /dev/port: %s", 1032}, + {"I failed to get permission because I didn't try.\n", 1033}, + {"%s is unable to get I/O port access: the iopl(3) call failed.\n", 1034}, + {"Probably you need root privileges.\n", 1035}, + {"Assuming hardware clock is kept in %s time.\n", 1036}, + {"UTC", 1037}, + {"local", 1038}, + {"%s: Warning: unrecognized third line in adjtime file\n", 1039}, + {"(Expected: `UTC' or `LOCAL' or nothing.)\n", 1040}, + {"Last drift adjustment done at %ld seconds after 1969\n", 1041}, + {"Last calibration done at %ld seconds after 1969\n", 1042}, + {"Hardware clock is on %s time\n", 1043}, + {"unknown", 1044}, + {"Waiting for clock tick...\n", 1045}, + {"...got clock tick\n", 1046}, + {"Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n", 1047}, + {"Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n", 1048}, + {"Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n", 1049}, + {"Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n", 1050}, + {"Clock not changed - testing only.\n", 1051}, {"\ Time elapsed since reference time has been %.6f seconds.\n\ -Delaying further to reach the next full second.\n", 1050}, +Delaying further to reach the next full second.\n", 1052}, {"\ The Hardware Clock registers contain values that are either invalid (e.g. \ -50th day of month) or beyond the range we can handle (e.g. Year 2095).\n", 1051}, - {"%s %.6f seconds\n", 1052}, - {"No --date option specified.\n", 1053}, - {"--date argument too long\n", 1054}, +50th day of month) or beyond the range we can handle (e.g. Year 2095).\n", 1053}, + {"%s %.6f seconds\n", 1054}, + {"No --date option specified.\n", 1055}, + {"--date argument too long\n", 1056}, {"\ The value of the --date option is not a valid date.\n\ -In particular, it contains quotation marks.\n", 1055}, - {"Issuing date command: %s\n", 1056}, - {"Unable to run 'date' program in /bin/sh shell. popen() failed", 1057}, - {"response from date command = %s\n", 1058}, +In particular, it contains quotation marks.\n", 1057}, + {"Issuing date command: %s\n", 1058}, + {"Unable to run 'date' program in /bin/sh shell. popen() failed", 1059}, + {"response from date command = %s\n", 1060}, {"\ The date command issued by %s returned unexpected results.\n\ The command was:\n\ %s\n\ The response was:\n\ - %s\n", 1059}, + %s\n", 1061}, {"\ The date command issued by %s returned something other than an integer where \ the converted time value was expected.\n\ The command was:\n\ %s\n\ The response was:\n\ - %s\n", 1060}, - {"date string %s equates to %ld seconds since 1969.\n", 1061}, + %s\n", 1062}, + {"date string %s equates to %ld seconds since 1969.\n", 1063}, {"\ The Hardware Clock does not contain a valid time, so we cannot set the \ -System Time from it.\n", 1062}, - {"Calling settimeofday:\n", 1063}, - {"\ttv.tv_sec = %ld, tv.tv_usec = %ld\n", 1064}, - {"\ttz.tz_minuteswest = %d\n", 1065}, - {"Not setting system clock because running in test mode.\n", 1066}, - {"Must be superuser to set system clock.\n", 1067}, - {"settimeofday() failed", 1068}, +System Time from it.\n", 1064}, + {"Calling settimeofday:\n", 1065}, + {"\ttv.tv_sec = %ld, tv.tv_usec = %ld\n", 1066}, + {"\ttz.tz_minuteswest = %d\n", 1067}, + {"Not setting system clock because running in test mode.\n", 1068}, + {"Must be superuser to set system clock.\n", 1069}, + {"settimeofday() failed", 1070}, {"\ Not adjusting drift factor because the Hardware Clock previously contained \ -garbage.\n", 1069}, +garbage.\n", 1071}, {"\ Not adjusting drift factor because last calibration time is zero,\n\ -so history is bad and calibration startover is necessary.\n", 1070}, +so history is bad and calibration startover is necessary.\n", 1072}, {"\ Not adjusting drift factor because it has been less than a day since the \ -last calibration.\n", 1071}, +last calibration.\n", 1073}, {"\ Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor \ of %f seconds/day.\n\ -Adjusting drift factor by %f seconds/day\n", 1072}, - {"Time since last adjustment is %d seconds\n", 1073}, - {"Need to insert %d seconds and refer time back %.6f seconds ago\n", 1074}, - {"Not updating adjtime file because of testing mode.\n", 1075}, +Adjusting drift factor by %f seconds/day\n", 1074}, + {"Time since last adjustment is %d seconds\n", 1075}, + {"Need to insert %d seconds and refer time back %.6f seconds ago\n", 1076}, + {"Not updating adjtime file because of testing mode.\n", 1077}, {"\ Would have written the following to %s:\n\ -%s", 1076}, - {"Drift adjustment parameters not updated.\n", 1077}, +%s", 1078}, + {"Drift adjustment parameters not updated.\n", 1079}, {"\ -The Hardware Clock does not contain a valid time, so we cannot adjust it.\n", 1078}, - {"Needed adjustment is less than one second, so not setting clock.\n", 1079}, - {"Using %s.\n", 1080}, - {"No usable clock interface found.\n", 1081}, - {"Unable to set system clock.\n", 1082}, +The Hardware Clock does not contain a valid time, so we cannot adjust it.\n", 1080}, + {"Needed adjustment is less than one second, so not setting clock.\n", 1081}, + {"Using %s.\n", 1082}, + {"No usable clock interface found.\n", 1083}, + {"Unable to set system clock.\n", 1084}, {"\ The kernel keeps an epoch value for the Hardware Clock only on an Alpha \ machine.\n\ This copy of hwclock was built for a machine other than Alpha\n\ -(and thus is presumably not running on an Alpha now). No action taken.\n", 1083}, - {"Unable to get the epoch value from the kernel.\n", 1084}, - {"Kernel is assuming an epoch value of %lu\n", 1085}, +(and thus is presumably not running on an Alpha now). No action taken.\n", 1085}, + {"Unable to get the epoch value from the kernel.\n", 1086}, + {"Kernel is assuming an epoch value of %lu\n", 1087}, {"\ To set the epoch value, you must use the 'epoch' option to tell to what \ -value to set it.\n", 1086}, - {"Not setting the epoch to %d - testing only.\n", 1087}, - {"Unable to set the epoch value in the kernel.\n", 1088}, +value to set it.\n", 1088}, + {"Not setting the epoch to %d - testing only.\n", 1089}, + {"Unable to set the epoch value in the kernel.\n", 1090}, {"\ hwclock - query and set the hardware clock (RTC)\n\ \n\ @@ -1504,557 +1509,558 @@ Options: \n\ --epoch=year specifies the year which is the beginning of the \n\ hardware clock's epoch value\n\ --noadjfile do not access /etc/adjtime. Requires the use of\n\ - either --utc or --localtime\n", 1089}, + either --utc or --localtime\n", 1091}, {"\ --jensen, --arc, --srm, --funky-toy\n\ - tell hwclock the type of alpha you have (see hwclock(8))\n", 1090}, - {"%s takes no non-option arguments. You supplied %d.\n", 1091}, + tell hwclock the type of alpha you have (see hwclock(8))\n", 1092}, + {"%s takes no non-option arguments. You supplied %d.\n", 1093}, {"\ You have specified multiple functions.\n\ -You can only perform one function at a time.\n", 1092}, +You can only perform one function at a time.\n", 1094}, {"\ %s: The --utc and --localtime options are mutually exclusive. You specified \ -both.\n", 1093}, +both.\n", 1095}, {"\ %s: The --adjust and --noadjfile options are mutually exclusive. You \ -specified both.\n", 1094}, - {"%s: With --noadjfile, you must specify either --utc or --localtime\n", 1095}, - {"No usable set-to time. Cannot set clock.\n", 1096}, - {"Sorry, only the superuser can change the Hardware Clock.\n", 1097}, - {"Sorry, only the superuser can change the System Clock.\n", 1098}, +specified both.\n", 1096}, + {"%s: With --noadjfile, you must specify either --utc or --localtime\n", 1097}, + {"No usable set-to time. Cannot set clock.\n", 1098}, + {"Sorry, only the superuser can change the Hardware Clock.\n", 1099}, + {"Sorry, only the superuser can change the System Clock.\n", 1100}, {"\ Sorry, only the superuser can change the Hardware Clock epoch in the \ -kernel.\n", 1099}, - {"Cannot access the Hardware Clock via any known method.\n", 1100}, +kernel.\n", 1101}, + {"Cannot access the Hardware Clock via any known method.\n", 1102}, {"\ Use the --debug option to see the details of our search for an access \ -method.\n", 1101}, - {"Waiting in loop for time from KDGHWCLK to change\n", 1102}, - {"KDGHWCLK ioctl to read time failed", 1103}, - {"Timed out waiting for time change.\n", 1104}, - {"KDGHWCLK ioctl to read time failed in loop", 1105}, - {"ioctl() failed to read time from %s", 1106}, - {"ioctl KDSHWCLK failed", 1107}, - {"Can't open /dev/tty1 or /dev/vc/1", 1108}, - {"KDGHWCLK ioctl failed", 1109}, - {"open() of %s failed", 1110}, - {"ioctl() to %s to read the time failed.\n", 1111}, - {"Waiting in loop for time from %s to change\n", 1112}, - {"%s does not have interrupt functions. ", 1113}, - {"read() to %s to wait for clock tick failed", 1114}, - {"select() to %s to wait for clock tick failed", 1115}, - {"select() to %s to wait for clock tick timed out\n", 1116}, - {"ioctl() to %s to turn off update interrupts failed", 1117}, - {"ioctl() to %s to turn on update interrupts failed unexpectedly", 1118}, - {"ioctl() to %s to set the time failed.\n", 1119}, - {"ioctl(%s) was successful.\n", 1120}, - {"Open of %s failed", 1121}, +method.\n", 1103}, + {"Waiting in loop for time from KDGHWCLK to change\n", 1104}, + {"KDGHWCLK ioctl to read time failed", 1105}, + {"Timed out waiting for time change.\n", 1106}, + {"KDGHWCLK ioctl to read time failed in loop", 1107}, + {"ioctl() failed to read time from %s", 1108}, + {"ioctl KDSHWCLK failed", 1109}, + {"Can't open /dev/tty1 or /dev/vc/1", 1110}, + {"KDGHWCLK ioctl failed", 1111}, + {"open() of %s failed", 1112}, + {"ioctl() to %s to read the time failed.\n", 1113}, + {"Waiting in loop for time from %s to change\n", 1114}, + {"%s does not have interrupt functions. ", 1115}, + {"read() to %s to wait for clock tick failed", 1116}, + {"select() to %s to wait for clock tick failed", 1117}, + {"select() to %s to wait for clock tick timed out\n", 1118}, + {"ioctl() to %s to turn off update interrupts failed", 1119}, + {"ioctl() to %s to turn on update interrupts failed unexpectedly", 1120}, + {"ioctl() to %s to set the time failed.\n", 1121}, + {"ioctl(%s) was successful.\n", 1122}, + {"Open of %s failed", 1123}, {"\ To manipulate the epoch value in the kernel, we must access the Linux 'rtc' \ device driver via the device special file %s. This file does not exist on \ -this system.\n", 1122}, - {"Unable to open %s", 1123}, - {"ioctl(RTC_EPOCH_READ) to %s failed", 1124}, - {"we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n", 1125}, - {"The epoch value may not be less than 1900. You requested %ld\n", 1126}, - {"setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n", 1127}, - {"\ -The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n", 1128}, - {"ioctl(RTC_EPOCH_SET) to %s failed", 1129}, - {"calling open_tty\n", 1130}, - {"calling termio_init\n", 1131}, - {"writing init string\n", 1132}, - {"before autobaud\n", 1133}, - {"waiting for cr-lf\n", 1134}, - {"read %c\n", 1135}, - {"reading login name\n", 1136}, - {"%s: can't exec %s: %m", 1137}, - {"can't malloc initstring", 1138}, - {"bad timeout value: %s", 1139}, - {"after getopt loop\n", 1140}, - {"exiting parseargs\n", 1141}, - {"entered parse_speeds\n", 1142}, - {"bad speed: %s", 1143}, - {"too many alternate speeds", 1144}, - {"exiting parsespeeds\n", 1145}, - {"/dev: chdir() failed: %m", 1146}, - {"/dev/%s: not a character device", 1147}, - {"open(2)\n", 1148}, - {"/dev/%s: cannot open as standard input: %m", 1149}, - {"%s: not open for read/write", 1150}, - {"duping\n", 1151}, - {"%s: dup problem: %m", 1152}, - {"term_io 2\n", 1153}, - {"user", 1154}, - {"users", 1155}, - {"%s: read: %m", 1156}, - {"%s: input overrun", 1157}, +this system.\n", 1124}, + {"Unable to open %s", 1125}, + {"ioctl(RTC_EPOCH_READ) to %s failed", 1126}, + {"we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n", 1127}, + {"The epoch value may not be less than 1900. You requested %ld\n", 1128}, + {"setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n", 1129}, + {"\ +The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n", 1130}, + {"ioctl(RTC_EPOCH_SET) to %s failed", 1131}, + {"calling open_tty\n", 1132}, + {"calling termio_init\n", 1133}, + {"writing init string\n", 1134}, + {"before autobaud\n", 1135}, + {"waiting for cr-lf\n", 1136}, + {"read %c\n", 1137}, + {"reading login name\n", 1138}, + {"%s: can't exec %s: %m", 1139}, + {"can't malloc initstring", 1140}, + {"bad timeout value: %s", 1141}, + {"after getopt loop\n", 1142}, + {"exiting parseargs\n", 1143}, + {"entered parse_speeds\n", 1144}, + {"bad speed: %s", 1145}, + {"too many alternate speeds", 1146}, + {"exiting parsespeeds\n", 1147}, + {"/dev: chdir() failed: %m", 1148}, + {"/dev/%s: not a character device", 1149}, + {"open(2)\n", 1150}, + {"/dev/%s: cannot open as standard input: %m", 1151}, + {"%s: not open for read/write", 1152}, + {"duping\n", 1153}, + {"%s: dup problem: %m", 1154}, + {"term_io 2\n", 1155}, + {"user", 1156}, + {"users", 1157}, + {"%s: read: %m", 1158}, + {"%s: input overrun", 1159}, {"\ Usage: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H \ login_host] baud_rate,... line [termtype]\n\ or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] \ -line baud_rate,... [termtype]\n", 1158}, - {"login: memory low, login may fail\n", 1159}, - {"can't malloc for ttyclass", 1160}, - {"can't malloc for grplist", 1161}, - {"Login on %s from %s denied by default.\n", 1162}, - {"Login on %s from %s denied.\n", 1163}, - {"%s: you (user %d) don't exist.\n", 1164}, - {"%s: user \"%s\" does not exist.\n", 1165}, - {"%s: can only change local entries; use yp%s instead.\n", 1166}, - {"Unknown user context", 1167}, - {"%s: %s is not authorized to change the finger info of %s\n", 1168}, - {"%s: Can't set default context for /etc/passwd", 1169}, - {"Changing finger information for %s.\n", 1170}, - {"Password error.", 1171}, - {"Password: ", 1172}, - {"Incorrect password.", 1173}, - {"Finger information not changed.\n", 1174}, - {"Usage: %s [ -f full-name ] [ -o office ] ", 1175}, +line baud_rate,... [termtype]\n", 1160}, + {"login: memory low, login may fail\n", 1161}, + {"can't malloc for ttyclass", 1162}, + {"can't malloc for grplist", 1163}, + {"Login on %s from %s denied by default.\n", 1164}, + {"Login on %s from %s denied.\n", 1165}, + {"%s: you (user %d) don't exist.\n", 1166}, + {"%s: user \"%s\" does not exist.\n", 1167}, + {"%s: can only change local entries; use yp%s instead.\n", 1168}, + {"Unknown user context", 1169}, + {"%s: %s is not authorized to change the finger info of %s\n", 1170}, + {"%s: Can't set default context for /etc/passwd", 1171}, + {"Changing finger information for %s.\n", 1172}, + {"Password error.", 1173}, + {"Password: ", 1174}, + {"Incorrect password.", 1175}, + {"Finger information not changed.\n", 1176}, + {"Usage: %s [ -f full-name ] [ -o office ] ", 1177}, {"\ [ -p office-phone ]\n\ -\t[ -h home-phone ] ", 1176}, - {"[ --help ] [ --version ]\n", 1177}, +\t[ -h home-phone ] ", 1178}, + {"[ --help ] [ --version ]\n", 1179}, {"\ \n\ -Aborted.\n", 1178}, - {"field is too long.\n", 1179}, - {"'%c' is not allowed.\n", 1180}, - {"Control characters are not allowed.\n", 1181}, - {"Finger information *NOT* changed. Try again later.\n", 1182}, - {"Finger information changed.\n", 1183}, - {"malloc failed", 1184}, - {"%s: %s is not authorized to change the shell of %s\n", 1185}, +Aborted.\n", 1180}, + {"field is too long.\n", 1181}, + {"'%c' is not allowed.\n", 1182}, + {"Control characters are not allowed.\n", 1183}, + {"Finger information *NOT* changed. Try again later.\n", 1184}, + {"Finger information changed.\n", 1185}, + {"malloc failed", 1186}, + {"%s: %s is not authorized to change the shell of %s\n", 1187}, {"\ %s: Running UID doesn't match UID of user we're altering, shell change \ -denied\n", 1186}, - {"%s: Your shell is not in /etc/shells, shell change denied\n", 1187}, - {"Changing shell for %s.\n", 1188}, - {"New shell", 1189}, - {"Shell not changed.\n", 1190}, - {"Shell *NOT* changed. Try again later.\n", 1191}, - {"Shell changed.\n", 1192}, +denied\n", 1188}, + {"%s: Your shell is not in /etc/shells, shell change denied\n", 1189}, + {"Changing shell for %s.\n", 1190}, + {"New shell", 1191}, + {"Shell not changed.\n", 1192}, + {"Shell *NOT* changed. Try again later.\n", 1193}, + {"Shell changed.\n", 1194}, {"\ Usage: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n\ - [ username ]\n", 1193}, - {"%s: shell must be a full path name.\n", 1194}, - {"%s: \"%s\" does not exist.\n", 1195}, - {"%s: \"%s\" is not executable.\n", 1196}, - {"%s: '%c' is not allowed.\n", 1197}, - {"%s: Control characters are not allowed.\n", 1198}, - {"Warning: \"%s\" is not listed in /etc/shells\n", 1199}, - {"%s: \"%s\" is not listed in /etc/shells.\n", 1200}, - {"%s: use -l option to see list\n", 1201}, - {"Warning: \"%s\" is not listed in /etc/shells.\n", 1202}, - {"Use %s -l to see list.\n", 1203}, - {"No known shells.\n", 1204}, - {"couldn't open /dev/urandom", 1205}, - {"couldn't read random data from /dev/urandom", 1206}, - {"can't open %s for reading", 1207}, - {"can't stat(%s)", 1208}, - {"%s doesn't have the correct filemodes", 1209}, - {"can't read data from %s", 1210}, - {"Can't read %s, exiting.", 1211}, - {"usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n", 1212}, - {" still logged in", 1213}, + [ username ]\n", 1195}, + {"%s: shell must be a full path name.\n", 1196}, + {"%s: \"%s\" does not exist.\n", 1197}, + {"%s: \"%s\" is not executable.\n", 1198}, + {"%s: '%c' is not allowed.\n", 1199}, + {"%s: Control characters are not allowed.\n", 1200}, + {"Warning: \"%s\" is not listed in /etc/shells\n", 1201}, + {"%s: \"%s\" is not listed in /etc/shells.\n", 1202}, + {"%s: use -l option to see list\n", 1203}, + {"Warning: \"%s\" is not listed in /etc/shells.\n", 1204}, + {"Use %s -l to see list.\n", 1205}, + {"No known shells.\n", 1206}, + {"couldn't open /dev/urandom", 1207}, + {"couldn't read random data from /dev/urandom", 1208}, + {"can't open %s for reading", 1209}, + {"can't stat(%s)", 1210}, + {"%s doesn't have the correct filemodes", 1211}, + {"can't read data from %s", 1212}, + {"Can't read %s, exiting.", 1213}, + {"usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n", 1214}, + {" still logged in", 1215}, {"\ \n\ -wtmp begins %s", 1214}, - {"last: malloc failure.\n", 1215}, - {"last: gethostname", 1216}, +wtmp begins %s", 1216}, + {"last: malloc failure.\n", 1217}, + {"last: gethostname", 1218}, {"\ \n\ -interrupted %10.10s %5.5s \n", 1217}, - {"FATAL: can't reopen tty: %s", 1218}, - {"FATAL: bad tty", 1219}, - {"login: -h for super-user only.\n", 1220}, - {"usage: login [-fp] [username]\n", 1221}, - {"login: PAM Failure, aborting: %s\n", 1222}, - {"Couldn't initialize PAM: %s", 1223}, - {"login: ", 1224}, - {"FAILED LOGIN %d FROM %s FOR %s, %s", 1225}, +interrupted %10.10s %5.5s \n", 1219}, + {"FATAL: can't reopen tty: %s", 1220}, + {"FATAL: bad tty", 1221}, + {"login: -h for super-user only.\n", 1222}, + {"usage: login [-fp] [username]\n", 1223}, + {"login: PAM Failure, aborting: %s\n", 1224}, + {"Couldn't initialize PAM: %s", 1225}, + {"login: ", 1226}, + {"FAILED LOGIN %d FROM %s FOR %s, %s", 1227}, {"\ Login incorrect\n\ -\n", 1226}, - {"TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s", 1227}, - {"FAILED LOGIN SESSION FROM %s FOR %s, %s", 1228}, +\n", 1228}, + {"TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s", 1229}, + {"FAILED LOGIN SESSION FROM %s FOR %s, %s", 1230}, {"\ \n\ -Login incorrect\n", 1229}, +Login incorrect\n", 1231}, {"\ \n\ -Session setup problem, abort.\n", 1230}, - {"NULL user name in %s:%d. Abort.", 1231}, - {"Invalid user name \"%s\" in %s:%d. Abort.", 1232}, - {"login: Out of memory\n", 1233}, - {"Illegal username", 1234}, - {"%s login refused on this terminal.\n", 1235}, - {"LOGIN %s REFUSED FROM %s ON TTY %s", 1236}, - {"LOGIN %s REFUSED ON TTY %s", 1237}, - {"Login incorrect\n", 1238}, +Session setup problem, abort.\n", 1232}, + {"NULL user name in %s:%d. Abort.", 1233}, + {"Invalid user name \"%s\" in %s:%d. Abort.", 1234}, + {"login: Out of memory\n", 1235}, + {"Illegal username", 1236}, + {"%s login refused on this terminal.\n", 1237}, + {"LOGIN %s REFUSED FROM %s ON TTY %s", 1238}, + {"LOGIN %s REFUSED ON TTY %s", 1239}, + {"Login incorrect\n", 1240}, {"\ Too many users logged on already.\n\ -Try again later.\n", 1239}, - {"You have too many processes running.\n", 1240}, - {"DIALUP AT %s BY %s", 1241}, - {"ROOT LOGIN ON %s FROM %s", 1242}, - {"ROOT LOGIN ON %s", 1243}, - {"LOGIN ON %s BY %s FROM %s", 1244}, - {"LOGIN ON %s BY %s", 1245}, - {"You have new mail.\n", 1246}, - {"You have mail.\n", 1247}, - {"login: failure forking: %s", 1248}, - {"TIOCSCTTY failed: %m", 1249}, - {"setuid() failed", 1250}, - {"No directory %s!\n", 1251}, - {"Logging in with home = \"/\".\n", 1252}, - {"login: no memory for shell script.\n", 1253}, - {"login: couldn't exec shell script: %s.\n", 1254}, - {"login: no shell: %s.\n", 1255}, +Try again later.\n", 1241}, + {"You have too many processes running.\n", 1242}, + {"DIALUP AT %s BY %s", 1243}, + {"ROOT LOGIN ON %s FROM %s", 1244}, + {"ROOT LOGIN ON %s", 1245}, + {"LOGIN ON %s BY %s FROM %s", 1246}, + {"LOGIN ON %s BY %s", 1247}, + {"You have new mail.\n", 1248}, + {"You have mail.\n", 1249}, + {"login: failure forking: %s", 1250}, + {"TIOCSCTTY failed: %m", 1251}, + {"setuid() failed", 1252}, + {"No directory %s!\n", 1253}, + {"Logging in with home = \"/\".\n", 1254}, + {"login: no memory for shell script.\n", 1255}, + {"login: couldn't exec shell script: %s.\n", 1256}, + {"login: no shell: %s.\n", 1257}, {"\ \n\ -%s login: ", 1256}, - {"login name much too long.\n", 1257}, - {"NAME too long", 1258}, - {"login names may not start with '-'.\n", 1259}, - {"too many bare linefeeds.\n", 1260}, - {"EXCESSIVE linefeeds", 1261}, - {"Login timed out after %d seconds\n", 1262}, - {"Last login: %.*s ", 1263}, - {"from %.*s\n", 1264}, - {"on %.*s\n", 1265}, - {"LOGIN FAILURE FROM %s, %s", 1266}, - {"LOGIN FAILURE ON %s, %s", 1267}, - {"%d LOGIN FAILURES FROM %s, %s", 1268}, - {"%d LOGIN FAILURES ON %s, %s", 1269}, - {"is y\n", 1270}, - {"is n\n", 1271}, - {"usage: mesg [y | n]\n", 1272}, - {"newgrp: Who are you?", 1273}, - {"newgrp: setgid", 1274}, - {"newgrp: No such group.", 1275}, - {"newgrp: Permission denied", 1276}, - {"newgrp: setuid", 1277}, - {"No shell", 1278}, - {"The password must have at least 6 characters, try again.\n", 1279}, +%s login: ", 1258}, + {"login name much too long.\n", 1259}, + {"NAME too long", 1260}, + {"login names may not start with '-'.\n", 1261}, + {"too many bare linefeeds.\n", 1262}, + {"EXCESSIVE linefeeds", 1263}, + {"Login timed out after %d seconds\n", 1264}, + {"Last login: %.*s ", 1265}, + {"from %.*s\n", 1266}, + {"on %.*s\n", 1267}, + {"LOGIN FAILURE FROM %s, %s", 1268}, + {"LOGIN FAILURE ON %s, %s", 1269}, + {"%d LOGIN FAILURES FROM %s, %s", 1270}, + {"%d LOGIN FAILURES ON %s, %s", 1271}, + {"is y\n", 1272}, + {"is n\n", 1273}, + {"usage: mesg [y | n]\n", 1274}, + {"newgrp: Who are you?", 1275}, + {"newgrp: setgid", 1276}, + {"newgrp: No such group.", 1277}, + {"newgrp: Permission denied", 1278}, + {"newgrp: setuid", 1279}, + {"No shell", 1280}, + {"The password must have at least 6 characters, try again.\n", 1281}, {"\ The password must contain characters out of two of the following\n\ classes: upper and lower case letters, digits and non alphanumeric\n\ -characters. See passwd(1) for more information.\n", 1280}, - {"You cannot reuse the old password.\n", 1281}, - {"Please don't use something like your username as password!\n", 1282}, - {"Please don't use something like your realname as password!\n", 1283}, - {"Usage: passwd [username [password]]\n", 1284}, - {"Only root may use the one and two argument forms.\n", 1285}, - {"Usage: passwd [-foqsvV] [user [password]]\n", 1286}, - {"Can't exec %s: %s\n", 1287}, - {"Cannot find login name", 1288}, - {"Only root can change the password for others.\n", 1289}, - {"Too many arguments.\n", 1290}, - {"Can't find username anywhere. Is `%s' really a user?", 1291}, - {"Sorry, I can only change local passwords. Use yppasswd instead.", 1292}, - {"UID and username does not match, imposter!", 1293}, - {"Changing password for %s\n", 1294}, - {"Enter old password: ", 1295}, - {"Illegal password, imposter.", 1296}, - {"Enter new password: ", 1297}, - {"Password not changed.", 1298}, - {"Re-type new password: ", 1299}, - {"You misspelled it. Password not changed.", 1300}, - {"password changed, user %s", 1301}, - {"ROOT PASSWORD CHANGED", 1302}, - {"password changed by root, user %s", 1303}, - {"calling setpwnam to set password.\n", 1304}, - {"Password *NOT* changed. Try again later.\n", 1305}, - {"Password changed.\n", 1306}, - {"Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n", 1307}, - {"Shutdown process aborted", 1308}, - {"%s: Only root can shut a system down.\n", 1309}, - {"That must be tomorrow, can't you wait till then?\n", 1310}, - {"for maintenance; bounce, bounce", 1311}, - {"timeout = %d, quiet = %d, reboot = %d\n", 1312}, - {"The system is being shut down within 5 minutes", 1313}, - {"Login is therefore prohibited.", 1314}, - {"rebooted by %s: %s", 1315}, - {"halted by %s: %s", 1316}, +characters. See passwd(1) for more information.\n", 1282}, + {"You cannot reuse the old password.\n", 1283}, + {"Please don't use something like your username as password!\n", 1284}, + {"Please don't use something like your realname as password!\n", 1285}, + {"Usage: passwd [username [password]]\n", 1286}, + {"Only root may use the one and two argument forms.\n", 1287}, + {"Usage: passwd [-foqsvV] [user [password]]\n", 1288}, + {"Can't exec %s: %s\n", 1289}, + {"Cannot find login name", 1290}, + {"Only root can change the password for others.\n", 1291}, + {"Too many arguments.\n", 1292}, + {"Can't find username anywhere. Is `%s' really a user?", 1293}, + {"Sorry, I can only change local passwords. Use yppasswd instead.", 1294}, + {"UID and username does not match, imposter!", 1295}, + {"Changing password for %s\n", 1296}, + {"Enter old password: ", 1297}, + {"Illegal password, imposter.", 1298}, + {"Enter new password: ", 1299}, + {"Password not changed.", 1300}, + {"Re-type new password: ", 1301}, + {"You misspelled it. Password not changed.", 1302}, + {"password changed, user %s", 1303}, + {"ROOT PASSWORD CHANGED", 1304}, + {"password changed by root, user %s", 1305}, + {"calling setpwnam to set password.\n", 1306}, + {"Password *NOT* changed. Try again later.\n", 1307}, + {"Password changed.\n", 1308}, + {"Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n", 1309}, + {"Shutdown process aborted", 1310}, + {"%s: Only root can shut a system down.\n", 1311}, + {"That must be tomorrow, can't you wait till then?\n", 1312}, + {"for maintenance; bounce, bounce", 1313}, + {"timeout = %d, quiet = %d, reboot = %d\n", 1314}, + {"The system is being shut down within 5 minutes", 1315}, + {"Login is therefore prohibited.", 1316}, + {"rebooted by %s: %s", 1317}, + {"halted by %s: %s", 1318}, {"\ \n\ -Why am I still alive after reboot?", 1317}, +Why am I still alive after reboot?", 1319}, {"\ \n\ -Now you can turn off the power...", 1318}, - {"Calling kernel power-off facility...\n", 1319}, - {"Error powering off\t%s\n", 1320}, - {"Executing the program \"%s\" ...\n", 1321}, - {"Error executing\t%s\n", 1322}, - {"URGENT: broadcast message from %s:", 1323}, - {"System going down in %d hours %d minutes", 1324}, - {"System going down in 1 hour %d minutes", 1325}, - {"System going down in %d minutes\n", 1326}, - {"System going down in 1 minute\n", 1327}, - {"System going down IMMEDIATELY!\n", 1328}, - {"\t... %s ...\n", 1329}, - {"Cannot fork for swapoff. Shrug!", 1330}, - {"Cannot exec swapoff, hoping umount will do the trick.", 1331}, - {"Cannot fork for umount, trying manually.", 1332}, - {"Cannot exec %s, trying umount.\n", 1333}, - {"Cannot exec umount, giving up on umount.", 1334}, - {"Unmounting any remaining filesystems...", 1335}, - {"shutdown: Couldn't umount %s: %s\n", 1336}, - {"Booting to single user mode.\n", 1337}, - {"exec of single user shell failed\n", 1338}, - {"fork of single user shell failed\n", 1339}, - {"error opening fifo\n", 1340}, - {"error setting close-on-exec on /dev/initctl", 1341}, - {"error running finalprog\n", 1342}, - {"error forking finalprog\n", 1343}, +Now you can turn off the power...", 1320}, + {"Calling kernel power-off facility...\n", 1321}, + {"Error powering off\t%s\n", 1322}, + {"Executing the program \"%s\" ...\n", 1323}, + {"Error executing\t%s\n", 1324}, + {"URGENT: broadcast message from %s:", 1325}, + {"System going down in %d hours %d minutes", 1326}, + {"System going down in 1 hour %d minutes", 1327}, + {"System going down in %d minutes\n", 1328}, + {"System going down in 1 minute\n", 1329}, + {"System going down IMMEDIATELY!\n", 1330}, + {"\t... %s ...\n", 1331}, + {"Cannot fork for swapoff. Shrug!", 1332}, + {"Cannot exec swapoff, hoping umount will do the trick.", 1333}, + {"Cannot fork for umount, trying manually.", 1334}, + {"Cannot exec %s, trying umount.\n", 1335}, + {"Cannot exec umount, giving up on umount.", 1336}, + {"Unmounting any remaining filesystems...", 1337}, + {"shutdown: Couldn't umount %s: %s\n", 1338}, + {"Booting to single user mode.\n", 1339}, + {"exec of single user shell failed\n", 1340}, + {"fork of single user shell failed\n", 1341}, + {"error opening fifo\n", 1342}, + {"error setting close-on-exec on /dev/initctl", 1343}, + {"error running finalprog\n", 1344}, + {"error forking finalprog\n", 1345}, {"\ \n\ -Wrong password.\n", 1344}, - {"lstat of path failed\n", 1345}, - {"stat of path failed\n", 1346}, - {"open of directory failed\n", 1347}, - {"fork failed\n", 1348}, - {"exec failed\n", 1349}, - {"cannot open inittab\n", 1350}, - {"no TERM or cannot stat tty\n", 1351}, - {"error stopping service: \"%s\"", 1352}, - {"too many iov's (change code in wall/ttymsg.c)", 1353}, - {"excessively long line arg", 1354}, - {"cannot fork", 1355}, - {"fork: %s", 1356}, - {"%s: BAD ERROR", 1357}, - {"%s: the password file is busy.\n", 1358}, - {"%s: the group file is busy.\n", 1359}, - {"%s: the %s file is busy (%s present)\n", 1360}, - {"%s: can't link %s: %s\n", 1361}, - {"%s: Can't get context for %s", 1362}, - {"%s: Can't set context for %s", 1363}, - {"%s: can't unlock %s: %s (your changes are still in %s)\n", 1364}, - {"%s: Cannot fork\n", 1365}, - {"%s: %s unchanged\n", 1366}, - {"%s: no changes made\n", 1367}, - {"You are using shadow groups on this system.\n", 1368}, - {"You are using shadow passwords on this system.\n", 1369}, - {"Would you like to edit %s now [y/n]? ", 1370}, - {"usage: %s [file]\n", 1371}, - {"%s: can't open temporary file.\n", 1372}, - {"Broadcast Message from %s@%s", 1373}, - {"%s: will not read %s - use stdin.\n", 1374}, - {"%s: can't read %s.\n", 1375}, - {"%s: can't stat temporary file.\n", 1376}, - {"%s: can't read temporary file.\n", 1377}, - {"illegal month value: use 1-12", 1378}, - {"illegal year value: use 1-9999", 1379}, - {"%s %d", 1380}, - {"usage: cal [-13smjyV] [[month] year]\n", 1381}, - {"usage: %s [+format] [day month year]\n", 1382}, - {"St. Tib's Day", 1383}, - {"%s: unknown signal %s\n", 1384}, - {"%s: can't find process \"%s\"\n", 1385}, - {"%s: unknown signal %s; valid signals:\n", 1386}, - {"usage: %s [ -s signal | -p ] [ -a ] pid ...\n", 1387}, - {" %s -l [ signal ]\n", 1388}, - {"logger: %s: %s.\n", 1389}, - {"logger: unknown facility name: %s.\n", 1390}, - {"logger: unknown priority name: %s.\n", 1391}, - {"\ -usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n", 1392}, - {"usage: look [-dfa] [-t char] string [file]\n", 1393}, - {"Could not open %s\n", 1394}, - {"Got %d bytes from %s\n", 1395}, - {"namei: unable to get current directory - %s\n", 1396}, - {"namei: unable to chdir to %s - %s (%d)\n", 1397}, - {"usage: namei [-mx] pathname [pathname ...]\n", 1398}, - {"namei: could not chdir to root!\n", 1399}, - {"namei: could not stat root!\n", 1400}, - {"namei: buf overflow\n", 1401}, - {" ? could not chdir into %s - %s (%d)\n", 1402}, - {" ? problems reading symlink %s - %s (%d)\n", 1403}, - {" *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n", 1404}, - {"namei: unknown file type 0%06o on file %s\n", 1405}, - {"%s: out of memory\n", 1406}, - {"%s: renaming %s to %s failed: %s\n", 1407}, - {"call: %s from to files...\n", 1408}, +Wrong password.\n", 1346}, + {"lstat of path failed\n", 1347}, + {"stat of path failed\n", 1348}, + {"open of directory failed\n", 1349}, + {"fork failed\n", 1350}, + {"exec failed\n", 1351}, + {"cannot open inittab\n", 1352}, + {"no TERM or cannot stat tty\n", 1353}, + {"error stopping service: \"%s\"", 1354}, + {"too many iov's (change code in wall/ttymsg.c)", 1355}, + {"excessively long line arg", 1356}, + {"cannot fork", 1357}, + {"fork: %s", 1358}, + {"%s: BAD ERROR", 1359}, + {"%s: the password file is busy.\n", 1360}, + {"%s: the group file is busy.\n", 1361}, + {"%s: the %s file is busy (%s present)\n", 1362}, + {"%s: can't link %s: %s\n", 1363}, + {"%s: Can't get context for %s", 1364}, + {"%s: Can't set context for %s", 1365}, + {"%s: can't unlock %s: %s (your changes are still in %s)\n", 1366}, + {"%s: Cannot fork\n", 1367}, + {"%s: %s unchanged\n", 1368}, + {"%s: no changes made\n", 1369}, + {"You are using shadow groups on this system.\n", 1370}, + {"You are using shadow passwords on this system.\n", 1371}, + {"Would you like to edit %s now [y/n]? ", 1372}, + {"usage: %s [file]\n", 1373}, + {"%s: can't open temporary file.\n", 1374}, + {"Broadcast Message from %s@%s", 1375}, + {"%s: will not read %s - use stdin.\n", 1376}, + {"%s: can't read %s.\n", 1377}, + {"%s: can't stat temporary file.\n", 1378}, + {"%s: can't read temporary file.\n", 1379}, + {"illegal month value: use 1-12", 1380}, + {"illegal year value: use 1-9999", 1381}, + {"%s %d", 1382}, + {"usage: cal [-13smjyV] [[month] year]\n", 1383}, + {"usage: %s [+format] [day month year]\n", 1384}, + {"St. Tib's Day", 1385}, + {"%s: unknown signal %s\n", 1386}, + {"%s: can't find process \"%s\"\n", 1387}, + {"%s: unknown signal %s; valid signals:\n", 1388}, + {"usage: %s [ -s signal | -p ] [ -a ] pid ...\n", 1389}, + {" %s -l [ signal ]\n", 1390}, + {"logger: %s: %s.\n", 1391}, + {"logger: unknown facility name: %s.\n", 1392}, + {"logger: unknown priority name: %s.\n", 1393}, + {"\ +usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n", 1394}, + {"usage: look [-dfa] [-t char] string [file]\n", 1395}, + {"Could not open %s\n", 1396}, + {"Got %d bytes from %s\n", 1397}, + {"namei: unable to get current directory - %s\n", 1398}, + {"namei: unable to chdir to %s - %s (%d)\n", 1399}, + {"usage: namei [-mx] pathname [pathname ...]\n", 1400}, + {"namei: could not chdir to root!\n", 1401}, + {"namei: could not stat root!\n", 1402}, + {"namei: buf overflow\n", 1403}, + {" ? could not chdir into %s - %s (%d)\n", 1404}, + {" ? problems reading symlink %s - %s (%d)\n", 1405}, + {" *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n", 1406}, + {"namei: unknown file type 0%06o on file %s\n", 1407}, + {"%s: out of memory\n", 1408}, + {"%s: renaming %s to %s failed: %s\n", 1409}, + {"call: %s from to files...\n", 1410}, {"\ Warning: `%s' is a link.\n\ Use `%s [options] %s' if you really want to use it.\n\ -Script not started.\n", 1409}, - {"usage: script [-a] [-f] [-q] [-t] [file]\n", 1410}, - {"Script started, file is %s\n", 1411}, - {"Script started on %s", 1412}, +Script not started.\n", 1411}, + {"usage: script [-a] [-f] [-q] [-t] [file]\n", 1412}, + {"Script started, file is %s\n", 1413}, + {"Script started on %s", 1414}, {"\ \n\ -Script done on %s", 1413}, - {"Script done, file is %s\n", 1414}, - {"openpty failed\n", 1415}, - {"Out of pty's\n", 1416}, - {"%s: Argument error, usage\n", 1417}, - {" [ -term terminal_name ]\n", 1418}, - {" [ -reset ]\n", 1419}, - {" [ -initialize ]\n", 1420}, - {" [ -cursor [on|off] ]\n", 1421}, - {" [ -snow [on|off] ]\n", 1422}, - {" [ -softscroll [on|off] ]\n", 1423}, - {" [ -repeat [on|off] ]\n", 1424}, - {" [ -appcursorkeys [on|off] ]\n", 1425}, - {" [ -linewrap [on|off] ]\n", 1426}, - {" [ -default ]\n", 1427}, - {" [ -foreground black|blue|green|cyan", 1428}, - {"|red|magenta|yellow|white|default ]\n", 1429}, - {" [ -background black|blue|green|cyan", 1430}, - {" [ -ulcolor black|grey|blue|green|cyan", 1431}, - {"|red|magenta|yellow|white ]\n", 1432}, - {" [ -ulcolor bright blue|green|cyan", 1433}, - {" [ -hbcolor black|grey|blue|green|cyan", 1434}, - {" [ -hbcolor bright blue|green|cyan", 1435}, - {" [ -standout [ attr ] ]\n", 1436}, - {" [ -inversescreen [on|off] ]\n", 1437}, - {" [ -bold [on|off] ]\n", 1438}, - {" [ -half-bright [on|off] ]\n", 1439}, - {" [ -blink [on|off] ]\n", 1440}, - {" [ -reverse [on|off] ]\n", 1441}, - {" [ -underline [on|off] ]\n", 1442}, - {" [ -store ]\n", 1443}, - {" [ -clear [all|rest] ]\n", 1444}, - {" [ -tabs [ tab1 tab2 tab3 ... ] ] (tabn = 1-160)\n", 1445}, - {" [ -clrtabs [ tab1 tab2 tab3 ... ] ] (tabn = 1-160)\n", 1446}, - {" [ -regtabs [1-160] ]\n", 1447}, - {" [ -blank [0-60] ]\n", 1448}, - {" [ -dump [1-NR_CONSOLES] ]\n", 1449}, - {" [ -append [1-NR_CONSOLES] ]\n", 1450}, - {" [ -file dumpfilename ]\n", 1451}, - {" [ -msg [on|off] ]\n", 1452}, - {" [ -msglevel [0-8] ]\n", 1453}, - {" [ -powersave [on|vsync|hsync|powerdown|off] ]\n", 1454}, - {" [ -powerdown [0-60] ]\n", 1455}, - {" [ -blength [0-2000] ]\n", 1456}, - {" [ -bfreq freqnumber ]\n", 1457}, - {"cannot (un)set powersave mode\n", 1458}, - {"klogctl error: %s\n", 1459}, - {"Error reading %s\n", 1460}, - {"Error writing screendump\n", 1461}, - {"couldn't read %s, and cannot ioctl dump\n", 1462}, - {"%s: $TERM is not defined.\n", 1463}, - {"whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n", 1464}, - {"write: can't find your tty's name\n", 1465}, - {"write: you have write permission turned off.\n", 1466}, - {"write: %s is not logged in on %s.\n", 1467}, - {"write: %s has messages disabled on %s\n", 1468}, - {"usage: write user [tty]\n", 1469}, - {"write: %s is not logged in\n", 1470}, - {"write: %s has messages disabled\n", 1471}, - {"write: %s is logged in more than once; writing to %s\n", 1472}, - {"Message from %s@%s (as %s) on %s at %s ...", 1473}, - {"Message from %s@%s on %s at %s ...", 1474}, - {"warning: error reading %s: %s", 1475}, - {"warning: can't open %s: %s", 1476}, - {"mount: could not open %s - using %s instead\n", 1477}, - {"can't create lock file %s: %s (use -n flag to override)", 1478}, - {"can't link lock file %s: %s (use -n flag to override)", 1479}, - {"can't open lock file %s: %s (use -n flag to override)", 1480}, - {"Can't lock lock file %s: %s\n", 1481}, - {"can't lock lock file %s: %s", 1482}, - {"timed out", 1483}, +Script done on %s", 1415}, + {"Script done, file is %s\n", 1416}, + {"openpty failed\n", 1417}, + {"Out of pty's\n", 1418}, + {"%s: Argument error, usage\n", 1419}, + {" [ -term terminal_name ]\n", 1420}, + {" [ -reset ]\n", 1421}, + {" [ -initialize ]\n", 1422}, + {" [ -cursor [on|off] ]\n", 1423}, + {" [ -snow [on|off] ]\n", 1424}, + {" [ -softscroll [on|off] ]\n", 1425}, + {" [ -repeat [on|off] ]\n", 1426}, + {" [ -appcursorkeys [on|off] ]\n", 1427}, + {" [ -linewrap [on|off] ]\n", 1428}, + {" [ -default ]\n", 1429}, + {" [ -foreground black|blue|green|cyan", 1430}, + {"|red|magenta|yellow|white|default ]\n", 1431}, + {" [ -background black|blue|green|cyan", 1432}, + {" [ -ulcolor black|grey|blue|green|cyan", 1433}, + {"|red|magenta|yellow|white ]\n", 1434}, + {" [ -ulcolor bright blue|green|cyan", 1435}, + {" [ -hbcolor black|grey|blue|green|cyan", 1436}, + {" [ -hbcolor bright blue|green|cyan", 1437}, + {" [ -standout [ attr ] ]\n", 1438}, + {" [ -inversescreen [on|off] ]\n", 1439}, + {" [ -bold [on|off] ]\n", 1440}, + {" [ -half-bright [on|off] ]\n", 1441}, + {" [ -blink [on|off] ]\n", 1442}, + {" [ -reverse [on|off] ]\n", 1443}, + {" [ -underline [on|off] ]\n", 1444}, + {" [ -store ]\n", 1445}, + {" [ -clear [all|rest] ]\n", 1446}, + {" [ -tabs [ tab1 tab2 tab3 ... ] ] (tabn = 1-160)\n", 1447}, + {" [ -clrtabs [ tab1 tab2 tab3 ... ] ] (tabn = 1-160)\n", 1448}, + {" [ -regtabs [1-160] ]\n", 1449}, + {" [ -blank [0-60] ]\n", 1450}, + {" [ -dump [1-NR_CONSOLES] ]\n", 1451}, + {" [ -append [1-NR_CONSOLES] ]\n", 1452}, + {" [ -file dumpfilename ]\n", 1453}, + {" [ -msg [on|off] ]\n", 1454}, + {" [ -msglevel [0-8] ]\n", 1455}, + {" [ -powersave [on|vsync|hsync|powerdown|off] ]\n", 1456}, + {" [ -powerdown [0-60] ]\n", 1457}, + {" [ -blength [0-2000] ]\n", 1458}, + {" [ -bfreq freqnumber ]\n", 1459}, + {"cannot (un)set powersave mode\n", 1460}, + {"klogctl error: %s\n", 1461}, + {"Error reading %s\n", 1462}, + {"Error writing screendump\n", 1463}, + {"couldn't read %s, and cannot ioctl dump\n", 1464}, + {"%s: $TERM is not defined.\n", 1465}, + {"whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n", 1466}, + {"write: can't find your tty's name\n", 1467}, + {"write: you have write permission turned off.\n", 1468}, + {"write: %s is not logged in on %s.\n", 1469}, + {"write: %s has messages disabled on %s\n", 1470}, + {"usage: write user [tty]\n", 1471}, + {"write: %s is not logged in\n", 1472}, + {"write: %s has messages disabled\n", 1473}, + {"write: %s is logged in more than once; writing to %s\n", 1474}, + {"Message from %s@%s (as %s) on %s at %s ...", 1475}, + {"Message from %s@%s on %s at %s ...", 1476}, + {"warning: error reading %s: %s", 1477}, + {"warning: can't open %s: %s", 1478}, + {"mount: could not open %s - using %s instead\n", 1479}, + {"can't create lock file %s: %s (use -n flag to override)", 1480}, + {"can't link lock file %s: %s (use -n flag to override)", 1481}, + {"can't open lock file %s: %s (use -n flag to override)", 1482}, + {"Can't lock lock file %s: %s\n", 1483}, + {"can't lock lock file %s: %s", 1484}, + {"timed out", 1485}, {"\ Cannot create link %s\n\ -Perhaps there is a stale lock file?\n", 1484}, - {"cannot open %s (%s) - mtab not updated", 1485}, - {"error writing %s: %s", 1486}, - {"error changing mode of %s: %s\n", 1487}, - {"can't rename %s to %s: %s\n", 1488}, - {"loop: can't open device %s: %s\n", 1489}, - {", offset %lld", 1490}, - {", sizelimit %lld", 1491}, - {", encryption %s (type %d)", 1492}, - {", offset %d", 1493}, - {", encryption type %d\n", 1494}, - {"loop: can't get info on device %s: %s\n", 1495}, - {"mount: could not find any device /dev/loop#", 1496}, - {"\ -mount: Could not find any loop device. Maybe this kernel does not know\n\ - about the loop device? (If so, recompile or `modprobe loop'.)", 1497}, - {"mount: could not find any free loop device", 1498}, - {"Couldn't lock into memory, exiting.\n", 1499}, - {"set_loop(%s,%s,%llu): success\n", 1500}, - {"loop: can't delete device %s: %s\n", 1501}, - {"del_loop(%s): success\n", 1502}, - {"This mount was compiled without loop support. Please recompile.\n", 1503}, +Perhaps there is a stale lock file?\n", 1486}, + {"cannot open %s (%s) - mtab not updated", 1487}, + {"error writing %s: %s", 1488}, + {"error changing mode of %s: %s\n", 1489}, + {"can't rename %s to %s: %s\n", 1490}, + {"loop: can't open device %s: %s\n", 1491}, + {", offset %lld", 1492}, + {", sizelimit %lld", 1493}, + {", encryption %s (type %d)", 1494}, + {", offset %d", 1495}, + {", encryption type %d\n", 1496}, + {"loop: can't get info on device %s: %s\n", 1497}, + {"%s: could not find any device /dev/loop#", 1498}, + {"\ +%s: Could not find any loop device. Maybe this kernel does not know\n\ + about the loop device? (If so, recompile or `modprobe loop'.)", 1499}, + {"%s: could not find any free loop device", 1500}, + {"Couldn't lock into memory, exiting.\n", 1501}, + {"set_loop(%s,%s,%llu): success\n", 1502}, + {"loop: can't delete device %s: %s\n", 1503}, + {"del_loop(%s): success\n", 1504}, + {"This mount was compiled without loop support. Please recompile.\n", 1505}, {"\ usage:\n\ - %s loop_device # give info\n\ - %s -d loop_device # delete\n\ - %s [ -e encryption ] [ -o offset ] loop_device file # setup\n", 1504}, - {"not enough memory", 1505}, - {"No loop support was available at compile time. Please recompile.\n", 1506}, - {"[mntent]: warning: no final newline at the end of %s\n", 1507}, - {"[mntent]: line %d in %s is bad%s\n", 1508}, - {"; rest of file ignored", 1509}, - {"mount: according to mtab, %s is already mounted on %s", 1510}, - {"mount: according to mtab, %s is mounted on %s", 1511}, - {"mount: can't open %s for writing: %s", 1512}, - {"mount: error writing %s: %s", 1513}, - {"mount: error changing mode of %s: %s", 1514}, - {"%s looks like swapspace - not mounted", 1515}, - {"mount failed", 1516}, - {"mount: only root can mount %s on %s", 1517}, - {"mount: loop device specified twice", 1518}, - {"mount: type specified twice", 1519}, - {"mount: skipping the setup of a loop device\n", 1520}, - {"mount: going to use the loop device %s\n", 1521}, - {"mount: failed setting up loop device\n", 1522}, - {"mount: setup loop device successfully\n", 1523}, - {"mount: can't open %s: %s", 1524}, - {"mount: argument to -p or --pass-fd must be a number", 1525}, - {"mount: cannot open %s for setting speed", 1526}, - {"mount: cannot set speed: %s", 1527}, - {"mount: cannot fork: %s", 1528}, - {"mount: this version was compiled without support for the type `nfs'", 1529}, - {"mount: failed with nfs mount version 4, trying 3..\n", 1530}, - {"\ -mount: I could not determine the filesystem type, and none was specified", 1531}, - {"mount: you must specify the filesystem type", 1532}, - {"mount: mount failed", 1533}, - {"mount: mount point %s is not a directory", 1534}, - {"mount: permission denied", 1535}, - {"mount: must be superuser to use mount", 1536}, - {"mount: %s is busy", 1537}, - {"mount: proc already mounted", 1538}, - {"mount: %s already mounted or %s busy", 1539}, - {"mount: mount point %s does not exist", 1540}, - {"mount: mount point %s is a symbolic link to nowhere", 1541}, - {"mount: special device %s does not exist", 1542}, + %s loop_device # give info\n\ + %s -d loop_device # delete\n\ + %s -f # find unused\n\ + %s [-e encryption] [-o offset] {-f|loop_device} file # setup\n", 1506}, + {"not enough memory", 1507}, + {"No loop support was available at compile time. Please recompile.\n", 1508}, + {"[mntent]: warning: no final newline at the end of %s\n", 1509}, + {"[mntent]: line %d in %s is bad%s\n", 1510}, + {"; rest of file ignored", 1511}, + {"mount: according to mtab, %s is already mounted on %s", 1512}, + {"mount: according to mtab, %s is mounted on %s", 1513}, + {"mount: can't open %s for writing: %s", 1514}, + {"mount: error writing %s: %s", 1515}, + {"mount: error changing mode of %s: %s", 1516}, + {"%s looks like swapspace - not mounted", 1517}, + {"mount failed", 1518}, + {"mount: only root can mount %s on %s", 1519}, + {"mount: loop device specified twice", 1520}, + {"mount: type specified twice", 1521}, + {"mount: skipping the setup of a loop device\n", 1522}, + {"mount: going to use the loop device %s\n", 1523}, + {"mount: failed setting up loop device\n", 1524}, + {"mount: setup loop device successfully\n", 1525}, + {"mount: can't open %s: %s", 1526}, + {"mount: argument to -p or --pass-fd must be a number", 1527}, + {"mount: cannot open %s for setting speed", 1528}, + {"mount: cannot set speed: %s", 1529}, + {"mount: cannot fork: %s", 1530}, + {"mount: this version was compiled without support for the type `nfs'", 1531}, + {"mount: failed with nfs mount version 4, trying 3..\n", 1532}, + {"\ +mount: I could not determine the filesystem type, and none was specified", 1533}, + {"mount: you must specify the filesystem type", 1534}, + {"mount: mount failed", 1535}, + {"mount: mount point %s is not a directory", 1536}, + {"mount: permission denied", 1537}, + {"mount: must be superuser to use mount", 1538}, + {"mount: %s is busy", 1539}, + {"mount: proc already mounted", 1540}, + {"mount: %s already mounted or %s busy", 1541}, + {"mount: mount point %s does not exist", 1542}, + {"mount: mount point %s is a symbolic link to nowhere", 1543}, + {"mount: special device %s does not exist", 1544}, {"\ mount: special device %s does not exist\n\ - (a path prefix is not a directory)\n", 1543}, - {"mount: %s not mounted already, or bad option", 1544}, + (a path prefix is not a directory)\n", 1545}, + {"mount: %s not mounted already, or bad option", 1546}, {"\ mount: wrong fs type, bad option, bad superblock on %s,\n\ - or too many mounted file systems", 1545}, - {"mount table full", 1546}, - {"mount: %s: can't read superblock", 1547}, - {"mount: %s: unknown device", 1548}, - {"mount: unknown filesystem type '%s'", 1549}, - {"mount: probably you meant %s", 1550}, - {"mount: maybe you meant 'iso9660'?", 1551}, - {"mount: maybe you meant 'vfat'?", 1552}, - {"mount: %s has wrong device number or fs type %s not supported", 1553}, - {"mount: %s is not a block device, and stat fails?", 1554}, + missing codepage, or too many mounted file systems", 1547}, + {"mount table full", 1548}, + {"mount: %s: can't read superblock", 1549}, + {"mount: %s: unknown device", 1550}, + {"mount: unknown filesystem type '%s'", 1551}, + {"mount: probably you meant %s", 1552}, + {"mount: maybe you meant 'iso9660'?", 1553}, + {"mount: maybe you meant 'vfat'?", 1554}, + {"mount: %s has wrong device number or fs type %s not supported", 1555}, + {"mount: %s is not a block device, and stat fails?", 1556}, {"\ mount: the kernel does not recognize %s as a block device\n\ - (maybe `insmod driver'?)", 1555}, - {"mount: %s is not a block device (maybe try `-o loop'?)", 1556}, - {"mount: %s is not a block device", 1557}, - {"mount: %s is not a valid block device", 1558}, - {"block device ", 1559}, - {"mount: cannot mount %s%s read-only", 1560}, - {"mount: %s%s is write-protected but explicit `-w' flag given", 1561}, - {"mount: %s%s is write-protected, mounting read-only", 1562}, - {"mount: no type was given - I'll assume nfs because of the colon\n", 1563}, - {"mount: no type was given - I'll assume smbfs because of the // prefix\n", 1564}, - {"mount: backgrounding \"%s\"\n", 1565}, - {"mount: giving up \"%s\"\n", 1566}, - {"mount: %s already mounted on %s\n", 1567}, + (maybe `insmod driver'?)", 1557}, + {"mount: %s is not a block device (maybe try `-o loop'?)", 1558}, + {"mount: %s is not a block device", 1559}, + {"mount: %s is not a valid block device", 1560}, + {"block device ", 1561}, + {"mount: cannot mount %s%s read-only", 1562}, + {"mount: %s%s is write-protected but explicit `-w' flag given", 1563}, + {"mount: %s%s is write-protected, mounting read-only", 1564}, + {"mount: no type was given - I'll assume nfs because of the colon\n", 1565}, + {"mount: no type was given - I'll assume smbfs because of the // prefix\n", 1566}, + {"mount: backgrounding \"%s\"\n", 1567}, + {"mount: giving up \"%s\"\n", 1568}, + {"mount: %s already mounted on %s\n", 1569}, {"\ Usage: mount -V : print version\n\ mount -h : print this help\n\ @@ -2076,290 +2082,291 @@ 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] [-p passwdfd].\n\ -For many more details, say man 8 mount .\n", 1568}, - {"mount: only root can do that", 1569}, - {"mount: no %s found - creating it..\n", 1570}, - {"mount: no such partition found", 1571}, - {"mount: mounting %s\n", 1572}, - {"nothing was mounted", 1573}, - {"mount: cannot find %s in %s", 1574}, - {"mount: can't find %s in %s or %s", 1575}, - {"\ -mount: could not open %s, so UUID and LABEL conversion cannot be done.\n", 1576}, - {"mount: bad UUID", 1577}, - {"mount: error while guessing filesystem type\n", 1578}, - {"mount: you didn't specify a filesystem type for %s\n", 1579}, - {" I will try all types mentioned in %s or %s\n", 1580}, - {" and it looks like this is swapspace\n", 1581}, - {" I will try type %s\n", 1582}, - {"Trying %s\n", 1583}, - {"mount: excessively long host:dir argument\n", 1584}, - {"mount: warning: multiple hostnames not supported\n", 1585}, - {"mount: directory to mount not in host:dir format\n", 1586}, - {"mount: can't get address for %s\n", 1587}, - {"mount: got bad hp->h_length\n", 1588}, - {"mount: excessively long option argument\n", 1589}, - {"Warning: Unrecognized proto= option.\n", 1590}, - {"Warning: Option namlen is not supported.\n", 1591}, - {"unknown nfs mount parameter: %s=%d\n", 1592}, - {"Warning: option nolock is not supported.\n", 1593}, - {"unknown nfs mount option: %s%s\n", 1594}, - {"mount: got bad hp->h_length?\n", 1595}, - {"NFS over TCP is not supported.\n", 1596}, - {"nfs socket", 1597}, - {"nfs bindresvport", 1598}, - {"nfs server reported service unavailable", 1599}, - {"used portmapper to find NFS port\n", 1600}, - {"using port %d for nfs deamon\n", 1601}, - {"nfs connect", 1602}, - {"unknown nfs status return value: %d", 1603}, - {"bug in xstrndup call", 1604}, +For many more details, say man 8 mount .\n", 1570}, + {"mount: only root can do that", 1571}, + {"mount: no %s found - creating it..\n", 1572}, + {"mount: no such partition found", 1573}, + {"mount: mounting %s\n", 1574}, + {"nothing was mounted", 1575}, + {"mount: cannot find %s in %s", 1576}, + {"mount: can't find %s in %s or %s", 1577}, + {"\ +mount: could not open %s, so UUID and LABEL conversion cannot be done.\n", 1578}, + {"mount: bad UUID", 1579}, + {"mount: error while guessing filesystem type\n", 1580}, + {"mount: you didn't specify a filesystem type for %s\n", 1581}, + {" I will try all types mentioned in %s or %s\n", 1582}, + {" and it looks like this is swapspace\n", 1583}, + {" I will try type %s\n", 1584}, + {"Trying %s\n", 1585}, + {"mount: excessively long host:dir argument\n", 1586}, + {"mount: warning: multiple hostnames not supported\n", 1587}, + {"mount: directory to mount not in host:dir format\n", 1588}, + {"mount: can't get address for %s\n", 1589}, + {"mount: got bad hp->h_length\n", 1590}, + {"mount: excessively long option argument\n", 1591}, + {"Warning: Unrecognized proto= option.\n", 1592}, + {"Warning: Option namlen is not supported.\n", 1593}, + {"unknown nfs mount parameter: %s=%d\n", 1594}, + {"Warning: option nolock is not supported.\n", 1595}, + {"unknown nfs mount option: %s%s\n", 1596}, + {"mount: got bad hp->h_length?\n", 1597}, + {"NFS over TCP is not supported.\n", 1598}, + {"nfs socket", 1599}, + {"nfs bindresvport", 1600}, + {"nfs server reported service unavailable", 1601}, + {"used portmapper to find NFS port\n", 1602}, + {"using port %d for nfs deamon\n", 1603}, + {"nfs connect", 1604}, + {"unknown nfs status return value: %d", 1605}, + {"bug in xstrndup call", 1606}, {"\ usage: %s [-hV]\n\ %s -a [-e] [-v]\n\ %s [-v] [-p priority] special ...\n\ - %s [-s]\n", 1605}, + %s [-s]\n", 1607}, {"\ usage: %s [-hV]\n\ %s -a [-v]\n\ - %s [-v] special ...\n", 1606}, - {"%s on %s\n", 1607}, - {"swapon: cannot stat %s: %s\n", 1608}, - {"swapon: warning: %s has insecure permissions %04o, %04o suggested\n", 1609}, - {"swapon: Skipping file %s - it appears to have holes.\n", 1610}, - {"Not superuser.\n", 1611}, - {"%s: cannot open %s: %s\n", 1612}, - {"umount: compiled without support for -f\n", 1613}, - {"host: %s, directory: %s\n", 1614}, - {"umount: can't get address for %s\n", 1615}, - {"umount: got bad hostp->h_length\n", 1616}, - {"umount: %s: invalid block device", 1617}, - {"umount: %s: not mounted", 1618}, - {"umount: %s: can't write superblock", 1619}, - {"umount: %s: device is busy", 1620}, - {"umount: %s: not found", 1621}, - {"umount: %s: must be superuser to umount", 1622}, - {"umount: %s: block devices not permitted on fs", 1623}, - {"umount: %s: %s", 1624}, - {"no umount2, trying umount...\n", 1625}, - {"could not umount %s - trying %s instead\n", 1626}, - {"umount: %s busy - remounted read-only\n", 1627}, - {"umount: could not remount %s read-only\n", 1628}, - {"%s umounted\n", 1629}, - {"umount: cannot find list of filesystems to unmount", 1630}, + %s [-v] special ...\n", 1608}, + {"%s on %s\n", 1609}, + {"swapon: cannot stat %s: %s\n", 1610}, + {"swapon: warning: %s has insecure permissions %04o, %04o suggested\n", 1611}, + {"swapon: Skipping file %s - it appears to have holes.\n", 1612}, + {"Not superuser.\n", 1613}, + {"%s: cannot open %s: %s\n", 1614}, + {"umount: compiled without support for -f\n", 1615}, + {"umount: cannot fork: %s", 1616}, + {"host: %s, directory: %s\n", 1617}, + {"umount: can't get address for %s\n", 1618}, + {"umount: got bad hostp->h_length\n", 1619}, + {"umount: %s: invalid block device", 1620}, + {"umount: %s: not mounted", 1621}, + {"umount: %s: can't write superblock", 1622}, + {"umount: %s: device is busy", 1623}, + {"umount: %s: not found", 1624}, + {"umount: %s: must be superuser to umount", 1625}, + {"umount: %s: block devices not permitted on fs", 1626}, + {"umount: %s: %s", 1627}, + {"no umount2, trying umount...\n", 1628}, + {"could not umount %s - trying %s instead\n", 1629}, + {"umount: %s busy - remounted read-only\n", 1630}, + {"umount: could not remount %s read-only\n", 1631}, + {"%s umounted\n", 1632}, + {"umount: cannot find list of filesystems to unmount", 1633}, {"\ Usage: umount [-hV]\n\ umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n\ - umount [-f] [-r] [-n] [-v] special | node...\n", 1631}, - {"Trying to umount %s\n", 1632}, - {"Could not find %s in mtab\n", 1633}, - {"umount: %s is not mounted (according to mtab)", 1634}, - {"umount: it seems %s is mounted multiple times", 1635}, - {"umount: %s is not in the fstab (and you are not root)", 1636}, - {"umount: %s mount disagrees with the fstab", 1637}, - {"umount: only %s can unmount %s from %s", 1638}, - {"umount: only root can do that", 1639}, - {"You must be root to set the Ctrl-Alt-Del behaviour.\n", 1640}, - {"Usage: ctrlaltdel hard|soft\n", 1641}, + umount [-f] [-r] [-n] [-v] special | node...\n", 1634}, + {"Trying to umount %s\n", 1635}, + {"Could not find %s in mtab\n", 1636}, + {"umount: %s is not mounted (according to mtab)", 1637}, + {"umount: it seems %s is mounted multiple times", 1638}, + {"umount: %s is not in the fstab (and you are not root)", 1639}, + {"umount: %s mount disagrees with the fstab", 1640}, + {"umount: only %s can unmount %s from %s", 1641}, + {"umount: only root can do that", 1642}, + {"You must be root to set the Ctrl-Alt-Del behaviour.\n", 1643}, + {"Usage: ctrlaltdel hard|soft\n", 1644}, {"\ File %s, For threshold value %lu, Maximum characters in fifo were %d,\n\ -and the maximum transfer rate in characters/second was %f\n", 1642}, +and the maximum transfer rate in characters/second was %f\n", 1645}, {"\ 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", 1643}, - {"Invalid interval value: %s\n", 1644}, - {"Invalid set value: %s\n", 1645}, - {"Invalid default value: %s\n", 1646}, - {"Invalid set time value: %s\n", 1647}, - {"Invalid default time value: %s\n", 1648}, +and the maximum transfer rate in characters/second was %f\n", 1646}, + {"Invalid interval value: %s\n", 1647}, + {"Invalid set value: %s\n", 1648}, + {"Invalid default value: %s\n", 1649}, + {"Invalid set time value: %s\n", 1650}, + {"Invalid default time value: %s\n", 1651}, {"\ Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) \ -[-g|-G] file [file...]\n", 1649}, - {"Can't open %s: %s\n", 1650}, - {"Can't set %s to threshold %d: %s\n", 1651}, - {"Can't set %s to time threshold %d: %s\n", 1652}, - {"Can't get threshold for %s: %s\n", 1653}, - {"Can't get timeout for %s: %s\n", 1654}, - {"%s: %ld current threshold and %ld current timeout\n", 1655}, - {"%s: %ld default threshold and %ld default timeout\n", 1656}, - {"Can't set signal handler", 1657}, - {"gettimeofday failed", 1658}, - {"Can't issue CYGETMON on %s: %s\n", 1659}, - {"\ -%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n", 1660}, - {" %f int/sec; %f rec, %f send (char/sec)\n", 1661}, - {"\ -%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n", 1662}, - {" %f int/sec; %f rec (char/sec)\n", 1663}, - {"Usage: %s [-c] [-n level] [-s bufsize]\n", 1664}, - {"invalid id: %s\n", 1665}, - {"cannot remove id %s (%s)\n", 1666}, - {"deprecated usage: %s {shm | msg | sem} id ...\n", 1667}, - {"unknown resource type: %s\n", 1668}, - {"resource(s) deleted\n", 1669}, +[-g|-G] file [file...]\n", 1652}, + {"Can't open %s: %s\n", 1653}, + {"Can't set %s to threshold %d: %s\n", 1654}, + {"Can't set %s to time threshold %d: %s\n", 1655}, + {"Can't get threshold for %s: %s\n", 1656}, + {"Can't get timeout for %s: %s\n", 1657}, + {"%s: %ld current threshold and %ld current timeout\n", 1658}, + {"%s: %ld default threshold and %ld default timeout\n", 1659}, + {"Can't set signal handler", 1660}, + {"gettimeofday failed", 1661}, + {"Can't issue CYGETMON on %s: %s\n", 1662}, + {"\ +%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n", 1663}, + {" %f int/sec; %f rec, %f send (char/sec)\n", 1664}, + {"\ +%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n", 1665}, + {" %f int/sec; %f rec (char/sec)\n", 1666}, + {"Usage: %s [-c] [-n level] [-s bufsize]\n", 1667}, + {"invalid id: %s\n", 1668}, + {"cannot remove id %s (%s)\n", 1669}, + {"deprecated usage: %s {shm | msg | sem} id ...\n", 1670}, + {"unknown resource type: %s\n", 1671}, + {"resource(s) deleted\n", 1672}, {"\ usage: %s [ [-q msqid] [-m shmid] [-s semid]\n\ - [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n", 1670}, - {"%s: illegal option -- %c\n", 1671}, - {"%s: illegal key (%s)\n", 1672}, - {"permission denied for key", 1673}, - {"already removed key", 1674}, - {"invalid key", 1675}, - {"unknown error in key", 1676}, - {"permission denied for id", 1677}, - {"invalid id", 1678}, - {"already removed id", 1679}, - {"unknown error in id", 1680}, - {"%s: %s (%s)\n", 1681}, - {"%s: unknown argument: %s\n", 1682}, - {"usage : %s -asmq -tclup \n", 1683}, - {"\t%s [-s -m -q] -i id\n", 1684}, - {"\t%s -h for help.\n", 1685}, - {"\ -%s provides information on ipc facilities for which you have read access.\n", 1686}, + [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n", 1673}, + {"%s: illegal option -- %c\n", 1674}, + {"%s: illegal key (%s)\n", 1675}, + {"permission denied for key", 1676}, + {"already removed key", 1677}, + {"invalid key", 1678}, + {"unknown error in key", 1679}, + {"permission denied for id", 1680}, + {"invalid id", 1681}, + {"already removed id", 1682}, + {"unknown error in id", 1683}, + {"%s: %s (%s)\n", 1684}, + {"%s: unknown argument: %s\n", 1685}, + {"usage : %s -asmq -tclup \n", 1686}, + {"\t%s [-s -m -q] -i id\n", 1687}, + {"\t%s -h for help.\n", 1688}, + {"\ +%s provides information on ipc facilities for which you have read access.\n", 1689}, {"\ Resource Specification:\n\ \t-m : shared_mem\n\ -\t-q : messages\n", 1687}, +\t-q : messages\n", 1690}, {"\ \t-s : semaphores\n\ -\t-a : all (default)\n", 1688}, +\t-a : all (default)\n", 1691}, {"\ Output Format:\n\ \t-t : time\n\ \t-p : pid\n\ -\t-c : creator\n", 1689}, +\t-c : creator\n", 1692}, {"\ \t-l : limits\n\ -\t-u : summary\n", 1690}, - {"-i id [-s -q -m] : details on resource identified by id\n", 1691}, - {"kernel not configured for shared memory\n", 1692}, - {"------ Shared Memory Limits --------\n", 1693}, - {"max number of segments = %lu\n", 1694}, - {"max seg size (kbytes) = %lu\n", 1695}, - {"max total shared memory (pages) = %lu\n", 1696}, - {"min seg size (bytes) = %lu\n", 1697}, - {"------ Shared Memory Status --------\n", 1698}, - {"segments allocated %d\n", 1699}, - {"pages allocated %ld\n", 1700}, - {"pages resident %ld\n", 1701}, - {"pages swapped %ld\n", 1702}, - {"Swap performance: %ld attempts\t %ld successes\n", 1703}, - {"------ Shared Memory Segment Creators/Owners --------\n", 1704}, - {"%-10s %-10s %-10s %-10s %-10s %-10s\n", 1705}, - {"shmid", 1706}, - {"perms", 1707}, - {"cuid", 1708}, - {"cgid", 1709}, - {"uid", 1710}, - {"gid", 1711}, - {"------ Shared Memory Attach/Detach/Change Times --------\n", 1712}, - {"%-10s %-10s %-20s %-20s %-20s\n", 1713}, - {"owner", 1714}, - {"attached", 1715}, - {"detached", 1716}, - {"changed", 1717}, - {"------ Shared Memory Creator/Last-op --------\n", 1718}, - {"%-10s %-10s %-10s %-10s\n", 1719}, - {"cpid", 1720}, - {"lpid", 1721}, - {"------ Shared Memory Segments --------\n", 1722}, - {"%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n", 1723}, - {"key", 1724}, - {"bytes", 1725}, - {"nattch", 1726}, - {"status", 1727}, - {"Not set", 1728}, - {"dest", 1729}, - {"locked", 1730}, - {"kernel not configured for semaphores\n", 1731}, - {"------ Semaphore Limits --------\n", 1732}, - {"max number of arrays = %d\n", 1733}, - {"max semaphores per array = %d\n", 1734}, - {"max semaphores system wide = %d\n", 1735}, - {"max ops per semop call = %d\n", 1736}, - {"semaphore max value = %d\n", 1737}, - {"------ Semaphore Status --------\n", 1738}, - {"used arrays = %d\n", 1739}, - {"allocated semaphores = %d\n", 1740}, - {"------ Semaphore Arrays Creators/Owners --------\n", 1741}, - {"semid", 1742}, - {"------ Shared Memory Operation/Change Times --------\n", 1743}, - {"%-8s %-10s %-26.24s %-26.24s\n", 1744}, - {"last-op", 1745}, - {"last-changed", 1746}, - {"------ Semaphore Arrays --------\n", 1747}, - {"%-10s %-10s %-10s %-10s %-10s\n", 1748}, - {"nsems", 1749}, - {"kernel not configured for message queues\n", 1750}, - {"------ Messages: Limits --------\n", 1751}, - {"max queues system wide = %d\n", 1752}, - {"max size of message (bytes) = %d\n", 1753}, - {"default max size of queue (bytes) = %d\n", 1754}, - {"------ Messages: Status --------\n", 1755}, - {"allocated queues = %d\n", 1756}, - {"used headers = %d\n", 1757}, - {"used space = %d bytes\n", 1758}, - {"------ Message Queues: Creators/Owners --------\n", 1759}, - {"msqid", 1760}, - {"------ Message Queues Send/Recv/Change Times --------\n", 1761}, - {"%-8s %-10s %-20s %-20s %-20s\n", 1762}, - {"send", 1763}, - {"recv", 1764}, - {"change", 1765}, - {"------ Message Queues PIDs --------\n", 1766}, - {"lspid", 1767}, - {"lrpid", 1768}, - {"------ Message Queues --------\n", 1769}, - {"%-10s %-10s %-10s %-10s %-12s %-12s\n", 1770}, - {"used-bytes", 1771}, - {"messages", 1772}, +\t-u : summary\n", 1693}, + {"-i id [-s -q -m] : details on resource identified by id\n", 1694}, + {"kernel not configured for shared memory\n", 1695}, + {"------ Shared Memory Limits --------\n", 1696}, + {"max number of segments = %lu\n", 1697}, + {"max seg size (kbytes) = %lu\n", 1698}, + {"max total shared memory (pages) = %lu\n", 1699}, + {"min seg size (bytes) = %lu\n", 1700}, + {"------ Shared Memory Status --------\n", 1701}, + {"segments allocated %d\n", 1702}, + {"pages allocated %ld\n", 1703}, + {"pages resident %ld\n", 1704}, + {"pages swapped %ld\n", 1705}, + {"Swap performance: %ld attempts\t %ld successes\n", 1706}, + {"------ Shared Memory Segment Creators/Owners --------\n", 1707}, + {"%-10s %-10s %-10s %-10s %-10s %-10s\n", 1708}, + {"shmid", 1709}, + {"perms", 1710}, + {"cuid", 1711}, + {"cgid", 1712}, + {"uid", 1713}, + {"gid", 1714}, + {"------ Shared Memory Attach/Detach/Change Times --------\n", 1715}, + {"%-10s %-10s %-20s %-20s %-20s\n", 1716}, + {"owner", 1717}, + {"attached", 1718}, + {"detached", 1719}, + {"changed", 1720}, + {"------ Shared Memory Creator/Last-op --------\n", 1721}, + {"%-10s %-10s %-10s %-10s\n", 1722}, + {"cpid", 1723}, + {"lpid", 1724}, + {"------ Shared Memory Segments --------\n", 1725}, + {"%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n", 1726}, + {"key", 1727}, + {"bytes", 1728}, + {"nattch", 1729}, + {"status", 1730}, + {"Not set", 1731}, + {"dest", 1732}, + {"locked", 1733}, + {"kernel not configured for semaphores\n", 1734}, + {"------ Semaphore Limits --------\n", 1735}, + {"max number of arrays = %d\n", 1736}, + {"max semaphores per array = %d\n", 1737}, + {"max semaphores system wide = %d\n", 1738}, + {"max ops per semop call = %d\n", 1739}, + {"semaphore max value = %d\n", 1740}, + {"------ Semaphore Status --------\n", 1741}, + {"used arrays = %d\n", 1742}, + {"allocated semaphores = %d\n", 1743}, + {"------ Semaphore Arrays Creators/Owners --------\n", 1744}, + {"semid", 1745}, + {"------ Shared Memory Operation/Change Times --------\n", 1746}, + {"%-8s %-10s %-26.24s %-26.24s\n", 1747}, + {"last-op", 1748}, + {"last-changed", 1749}, + {"------ Semaphore Arrays --------\n", 1750}, + {"%-10s %-10s %-10s %-10s %-10s\n", 1751}, + {"nsems", 1752}, + {"kernel not configured for message queues\n", 1753}, + {"------ Messages: Limits --------\n", 1754}, + {"max queues system wide = %d\n", 1755}, + {"max size of message (bytes) = %d\n", 1756}, + {"default max size of queue (bytes) = %d\n", 1757}, + {"------ Messages: Status --------\n", 1758}, + {"allocated queues = %d\n", 1759}, + {"used headers = %d\n", 1760}, + {"used space = %d bytes\n", 1761}, + {"------ Message Queues: Creators/Owners --------\n", 1762}, + {"msqid", 1763}, + {"------ Message Queues Send/Recv/Change Times --------\n", 1764}, + {"%-8s %-10s %-20s %-20s %-20s\n", 1765}, + {"send", 1766}, + {"recv", 1767}, + {"change", 1768}, + {"------ Message Queues PIDs --------\n", 1769}, + {"lspid", 1770}, + {"lrpid", 1771}, + {"------ Message Queues --------\n", 1772}, + {"%-10s %-10s %-10s %-10s %-12s %-12s\n", 1773}, + {"used-bytes", 1774}, + {"messages", 1775}, {"\ \n\ -Shared memory Segment shmid=%d\n", 1773}, - {"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n", 1774}, - {"mode=%#o\taccess_perms=%#o\n", 1775}, - {"bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n", 1776}, - {"att_time=%-26.24s\n", 1777}, - {"det_time=%-26.24s\n", 1778}, - {"change_time=%-26.24s\n", 1779}, +Shared memory Segment shmid=%d\n", 1776}, + {"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n", 1777}, + {"mode=%#o\taccess_perms=%#o\n", 1778}, + {"bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n", 1779}, + {"att_time=%-26.24s\n", 1780}, + {"det_time=%-26.24s\n", 1781}, + {"change_time=%-26.24s\n", 1782}, {"\ \n\ -Message Queue msqid=%d\n", 1780}, - {"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n", 1781}, - {"cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n", 1782}, - {"send_time=%-26.24s\n", 1783}, - {"rcv_time=%-26.24s\n", 1784}, +Message Queue msqid=%d\n", 1783}, + {"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n", 1784}, + {"cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n", 1785}, + {"send_time=%-26.24s\n", 1786}, + {"rcv_time=%-26.24s\n", 1787}, {"\ \n\ -Semaphore Array semid=%d\n", 1785}, - {"uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n", 1786}, - {"mode=%#o, access_perms=%#o\n", 1787}, - {"nsems = %ld\n", 1788}, - {"otime = %-26.24s\n", 1789}, - {"ctime = %-26.24s\n", 1790}, - {"semnum", 1791}, - {"value", 1792}, - {"ncount", 1793}, - {"zcount", 1794}, - {"pid", 1795}, - {"usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]", 1796}, - {"\ - rdev /dev/fd0 (or rdev /linux, etc.) displays the current ROOT device", 1797}, - {" rdev /dev/fd0 /dev/hda2 sets ROOT to /dev/hda2", 1798}, - {" rdev -R /dev/fd0 1 set the ROOTFLAGS (readonly status)", 1799}, - {" rdev -r /dev/fd0 627 set the RAMDISK size", 1800}, - {" rdev -v /dev/fd0 1 set the bootup VIDEOMODE", 1801}, - {" rdev -o N ... use the byte offset N", 1802}, - {" rootflags ... same as rdev -R", 1803}, - {" ramsize ... same as rdev -r", 1804}, - {" vidmode ... same as rdev -v", 1805}, - {"\ -Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,...", 1806}, - {" use -R 1 to mount root readonly, -R 0 for read/write.", 1807}, - {"missing comma", 1808}, - {"out of memory", 1809}, +Semaphore Array semid=%d\n", 1788}, + {"uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n", 1789}, + {"mode=%#o, access_perms=%#o\n", 1790}, + {"nsems = %ld\n", 1791}, + {"otime = %-26.24s\n", 1792}, + {"ctime = %-26.24s\n", 1793}, + {"semnum", 1794}, + {"value", 1795}, + {"ncount", 1796}, + {"zcount", 1797}, + {"pid", 1798}, + {"usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]", 1799}, + {"\ + rdev /dev/fd0 (or rdev /linux, etc.) displays the current ROOT device", 1800}, + {" rdev /dev/fd0 /dev/hda2 sets ROOT to /dev/hda2", 1801}, + {" rdev -R /dev/fd0 1 set the ROOTFLAGS (readonly status)", 1802}, + {" rdev -r /dev/fd0 627 set the RAMDISK size", 1803}, + {" rdev -v /dev/fd0 1 set the bootup VIDEOMODE", 1804}, + {" rdev -o N ... use the byte offset N", 1805}, + {" rootflags ... same as rdev -R", 1806}, + {" ramsize ... same as rdev -r", 1807}, + {" vidmode ... same as rdev -v", 1808}, + {"\ +Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,...", 1809}, + {" use -R 1 to mount root readonly, -R 0 for read/write.", 1810}, + {"missing comma", 1811}, + {"out of memory", 1812}, {"\ %s: Usage: \"%s [options]\n\ \t -m (defaults: \"%s\" and\n\ @@ -2373,76 +2380,77 @@ Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,...", 1 \t -s print individual counters within functions\n\ \t -r reset all the counters (root only)\n\ \t -n disable byte order auto-detection\n\ -\t -V print version and exit\n", 1810}, - {"%s version %s\n", 1811}, - {"Sampling_step: %i\n", 1812}, - {"%s: %s(%i): wrong map line\n", 1813}, - {"%s: can't find \"_stext\" in %s\n", 1814}, - {"%s: profile address out of range. Wrong map file?\n", 1815}, - {"total", 1816}, - {"\ -usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n", 1817}, - {"renice: %s: unknown user\n", 1818}, - {"renice: %s: bad value\n", 1819}, - {"getpriority", 1820}, - {"setpriority", 1821}, - {"%d: old priority %d, new priority %d\n", 1822}, - {"usage: %s program [arg ...]\n", 1823}, +\t -V print version and exit\n", 1813}, + {"%s version %s\n", 1814}, + {"Sampling_step: %i\n", 1815}, + {"%s: %s(%i): wrong map line\n", 1816}, + {"%s: can't find \"_stext\" in %s\n", 1817}, + {"%s: profile address out of range. Wrong map file?\n", 1818}, + {"total", 1819}, + {"\ +usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n", 1820}, + {"renice: %s: unknown user\n", 1821}, + {"renice: %s: bad value\n", 1822}, + {"getpriority", 1823}, + {"setpriority", 1824}, + {"%d: old priority %d, new priority %d\n", 1825}, + {"usage: %s program [arg ...]\n", 1826}, {"\ Usage: %s [ -i | -t