po: update po files

Signed-off-by: Karel Zak <kzak@redhat.com>

1 files changed, 422 insertions, 347 deletions

diff --git a/po/util-linux-ng.pot b/po/util-linux-ng.pot
index 14c7de034..a81d1c7f6 100644
--- a/po/util-linux-ng.pot
+++ b/po/util-linux-ng.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2007-08-28 00:12+0200\n"
+"POT-Creation-Date: 2007-10-11 14:29+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -174,9 +174,9 @@ msgstr ""
 
 #: disk-utils/fdformat.c:116 disk-utils/fsck.minix.c:1249
 #: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:52
-#: disk-utils/mkfs.cramfs.c:784 disk-utils/mkfs.minix.c:626
+#: disk-utils/mkfs.cramfs.c:785 disk-utils/mkfs.minix.c:629
 #: disk-utils/mkswap.c:518 misc-utils/ddate.c:179 misc-utils/rename.c:79
-#: misc-utils/script.c:146 sys-utils/readprofile.c:197
+#: misc-utils/script.c:147 sys-utils/readprofile.c:197
 #, c-format
 msgid "%s (%s)\n"
 msgstr ""
@@ -203,7 +203,7 @@ msgstr ""
 msgid "Single"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:118
+#: disk-utils/fsck.cramfs.c:117
 #, c-format
 msgid ""
 "usage: %s [-hv] [-x dir] file\n"
@@ -512,8 +512,8 @@ msgstr ""
 msgid "Zone %d: not in use, counted=%d\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1254 disk-utils/mkfs.minix.c:631
-#: disk-utils/mkfs.minix.c:633
+#: disk-utils/fsck.minix.c:1254 disk-utils/mkfs.minix.c:634
+#: disk-utils/mkfs.minix.c:636
 msgid "bad inode size"
 msgstr ""
 
@@ -658,7 +658,7 @@ msgstr ""
 msgid "not enough space, need at least %lu blocks"
 msgstr ""
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2321
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:2314
 #, c-format
 msgid "Device: %s\n"
 msgstr ""
@@ -765,7 +765,7 @@ msgstr ""
 #: disk-utils/mkfs.cramfs.c:337
 #, c-format
 msgid ""
-"Very long (%u bytes) filename `%s' found.\n"
+"Very long (%zu bytes) filename `%s' found.\n"
 " Please increase MAX_INPUT_NAMELEN in mkcramfs.c and recompile.  Exiting.\n"
 msgstr ""
 
@@ -774,86 +774,86 @@ msgstr ""
 msgid "filesystem too big.  Exiting.\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:627
+#: disk-utils/mkfs.cramfs.c:628
 #, c-format
 msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:646
+#: disk-utils/mkfs.cramfs.c:647
 #, c-format
-msgid "%6.2f%% (%+d bytes)\t%s\n"
+msgid "%6.2f%% (%+ld bytes)\t%s\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:825
+#: disk-utils/mkfs.cramfs.c:826
 #, c-format
 msgid ""
-"warning: guestimate of required size (upper bound) is %LdMB, but maximum "
+"warning: guestimate of required size (upper bound) is %lldMB, but maximum "
 "image size is %uMB.  We might die prematurely.\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:866
+#: disk-utils/mkfs.cramfs.c:867
 #, c-format
 msgid "Including: %s\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:872
+#: disk-utils/mkfs.cramfs.c:873
 #, c-format
-msgid "Directory data: %d bytes\n"
+msgid "Directory data: %zd bytes\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:880
+#: disk-utils/mkfs.cramfs.c:881
 #, c-format
-msgid "Everything: %d kilobytes\n"
+msgid "Everything: %zd kilobytes\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:885
+#: disk-utils/mkfs.cramfs.c:886
 #, c-format
-msgid "Super block: %d bytes\n"
+msgid "Super block: %zd bytes\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:892
+#: disk-utils/mkfs.cramfs.c:893
 #, c-format
 msgid "CRC: %x\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:897
+#: disk-utils/mkfs.cramfs.c:898
 #, c-format
-msgid "not enough space allocated for ROM image (%Ld allocated, %d used)\n"
+msgid "not enough space allocated for ROM image (%lld allocated, %zu used)\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:909
+#: disk-utils/mkfs.cramfs.c:910
 #, c-format
-msgid "ROM image write failed (%d %d)\n"
+msgid "ROM image write failed (%zd %zd)\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:918
+#: disk-utils/mkfs.cramfs.c:919
 #, c-format
 msgid "warning: filenames truncated to 255 bytes.\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:921
+#: disk-utils/mkfs.cramfs.c:922
 #, c-format
 msgid "warning: files were skipped due to errors.\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:924
+#: disk-utils/mkfs.cramfs.c:925
 #, c-format
 msgid "warning: file sizes truncated to %luMB (minus 1 byte).\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:929
+#: disk-utils/mkfs.cramfs.c:930
 #, c-format
 msgid ""
 "warning: uids truncated to %u bits.  (This may be a security concern.)\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:934
+#: disk-utils/mkfs.cramfs.c:935
 #, c-format
 msgid ""
 "warning: gids truncated to %u bits.  (This may be a security concern.)\n"
 msgstr ""
 
-#: disk-utils/mkfs.cramfs.c:939
+#: disk-utils/mkfs.cramfs.c:940
 #, c-format
 msgid ""
 "WARNING: device numbers truncated to %u bits.  This almost certainly means\n"
@@ -939,12 +939,12 @@ msgstr ""
 msgid "bad blocks before data-area: cannot make fs"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:580 disk-utils/mkfs.minix.c:602
+#: disk-utils/mkfs.minix.c:580 disk-utils/mkfs.minix.c:605
 #, c-format
 msgid "%d bad blocks\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:582 disk-utils/mkfs.minix.c:604
+#: disk-utils/mkfs.minix.c:582 disk-utils/mkfs.minix.c:607
 #, c-format
 msgid "one bad block\n"
 msgstr ""
@@ -953,22 +953,31 @@ msgstr ""
 msgid "can't open file of bad blocks"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:674
+#: disk-utils/mkfs.minix.c:596
+#, c-format
+msgid "badblock number input error on line %d\n"
+msgstr ""
+
+#: disk-utils/mkfs.minix.c:597
+msgid "cannot read badblocks file"
+msgstr ""
+
+#: disk-utils/mkfs.minix.c:677
 #, c-format
 msgid "strtol error: number of blocks not specified"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:703
+#: disk-utils/mkfs.minix.c:706
 #, c-format
 msgid "unable to stat %s"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:709
+#: disk-utils/mkfs.minix.c:712
 #, c-format
 msgid "unable to open %s"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:713
+#: disk-utils/mkfs.minix.c:716
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr ""
@@ -1012,8 +1021,8 @@ msgstr ""
 msgid "too many bad pages"
 msgstr ""
 
-#: disk-utils/mkswap.c:391 misc-utils/look.c:183 misc-utils/setterm.c:1147
-#: text-utils/more.c:1988 text-utils/more.c:1999
+#: disk-utils/mkswap.c:391 misc-utils/look.c:182 misc-utils/setterm.c:1147
+#: text-utils/more.c:1987 text-utils/more.c:1998
 msgid "Out of memory"
 msgstr ""
 
@@ -2735,7 +2744,7 @@ msgstr ""
 
 #: fdisk/fdisk.c:1515
 #, c-format
-msgid "System type of partition %d is unchangedto %x (%s)\n"
+msgid "System type of partition %d is unchanged to %x (%s)\n"
 msgstr ""
 
 #: fdisk/fdisk.c:1567
@@ -2982,12 +2991,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2254
+#: fdisk/fdisk.c:2256
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2270
+#: fdisk/fdisk.c:2263
 #, c-format
 msgid ""
 "\n"
@@ -2996,7 +3005,7 @@ msgid ""
 "The new table will be used at the next reboot.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2280
+#: fdisk/fdisk.c:2273
 #, c-format
 msgid ""
 "\n"
@@ -3005,49 +3014,49 @@ msgid ""
 "information.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2286
+#: fdisk/fdisk.c:2279
 #, c-format
 msgid ""
 "\n"
 "Error closing file\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2290
+#: fdisk/fdisk.c:2283
 #, c-format
 msgid "Syncing disks.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2337
+#: fdisk/fdisk.c:2330
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2342
+#: fdisk/fdisk.c:2335
 msgid "New beginning of data"
 msgstr ""
 
-#: fdisk/fdisk.c:2358
+#: fdisk/fdisk.c:2351
 msgid "Expert command (m for help): "
 msgstr ""
 
-#: fdisk/fdisk.c:2371
+#: fdisk/fdisk.c:2364
 msgid "Number of cylinders"
 msgstr ""
 
-#: fdisk/fdisk.c:2398
+#: fdisk/fdisk.c:2391
 msgid "Number of heads"
 msgstr ""
 
-#: fdisk/fdisk.c:2425
+#: fdisk/fdisk.c:2418
 msgid "Number of sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:2428
+#: fdisk/fdisk.c:2421
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2487
+#: fdisk/fdisk.c:2480
 #, c-format
 msgid ""
 "\n"
@@ -3056,64 +3065,64 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2509
+#: fdisk/fdisk.c:2502
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2520
+#: fdisk/fdisk.c:2513
 #, c-format
 msgid "Cannot open %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2538 fdisk/sfdisk.c:2423
+#: fdisk/fdisk.c:2531 fdisk/sfdisk.c:2423
 #, c-format
 msgid "cannot open %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2558
+#: fdisk/fdisk.c:2551
 #, c-format
 msgid "%c: unknown command\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2628
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2632
+#: fdisk/fdisk.c:2625
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2693
+#: fdisk/fdisk.c:2686
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2703
+#: fdisk/fdisk.c:2696
 msgid "Command (m for help): "
 msgstr ""
 
-#: fdisk/fdisk.c:2719
+#: fdisk/fdisk.c:2712
 #, c-format
 msgid ""
 "\n"
 "The current boot file is: %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2721
+#: fdisk/fdisk.c:2714
 msgid "Please enter the name of the new boot file: "
 msgstr ""
 
-#: fdisk/fdisk.c:2723
+#: fdisk/fdisk.c:2716
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2796
+#: fdisk/fdisk.c:2789
 #, c-format
 msgid ""
 "\n"
@@ -5001,7 +5010,7 @@ msgstr ""
 msgid "UTC"
 msgstr ""
 
-#: hwclock/hwclock.c:230 hwclock/hwclock.c:323 sys-utils/rtcwake.c:381
+#: hwclock/hwclock.c:230 hwclock/hwclock.c:323
 msgid "local"
 msgstr ""
 
@@ -5299,7 +5308,7 @@ msgstr ""
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1186 misc-utils/cal.c:333 misc-utils/kill.c:189
+#: hwclock/hwclock.c:1186 misc-utils/cal.c:332 misc-utils/kill.c:189
 #, c-format
 msgid "%s from %s\n"
 msgstr ""
@@ -5423,7 +5432,7 @@ msgstr ""
 msgid "KDGHWCLK ioctl to read time failed"
 msgstr ""
 
-#: hwclock/kd.c:79 hwclock/rtc.c:205
+#: hwclock/kd.c:79 hwclock/rtc.c:202
 #, c-format
 msgid "Timed out waiting for time change.\n"
 msgstr ""
@@ -5449,67 +5458,67 @@ msgstr ""
 msgid "KDGHWCLK ioctl failed"
 msgstr ""
 
-#: hwclock/rtc.c:133 hwclock/rtc.c:226
+#: hwclock/rtc.c:130 hwclock/rtc.c:223
 #, c-format
 msgid "open() of %s failed"
 msgstr ""
 
-#: hwclock/rtc.c:167
+#: hwclock/rtc.c:164
 #, c-format
 msgid "ioctl() to %s to read the time failed.\n"
 msgstr ""
 
-#: hwclock/rtc.c:189
+#: hwclock/rtc.c:186
 #, c-format
 msgid "Waiting in loop for time from %s to change\n"
 msgstr ""
 
-#: hwclock/rtc.c:244
+#: hwclock/rtc.c:241
 #, c-format
 msgid "%s does not have interrupt functions. "
 msgstr ""
 
-#: hwclock/rtc.c:255
+#: hwclock/rtc.c:252
 #, c-format
 msgid "read() to %s to wait for clock tick failed"
 msgstr ""
 
-#: hwclock/rtc.c:273
+#: hwclock/rtc.c:270
 #, c-format
 msgid "select() to %s to wait for clock tick failed"
 msgstr ""
 
-#: hwclock/rtc.c:276
+#: hwclock/rtc.c:273
 #, c-format
 msgid "select() to %s to wait for clock tick timed out\n"
 msgstr ""
 
-#: hwclock/rtc.c:285
+#: hwclock/rtc.c:282
 #, c-format
 msgid "ioctl() to %s to turn off update interrupts failed"
 msgstr ""
 
-#: hwclock/rtc.c:288
+#: hwclock/rtc.c:285
 #, c-format
 msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
 msgstr ""
 
-#: hwclock/rtc.c:347
+#: hwclock/rtc.c:344
 #, c-format
 msgid "ioctl() to %s to set the time failed.\n"
 msgstr ""
 
-#: hwclock/rtc.c:353
+#: hwclock/rtc.c:350
 #, c-format
 msgid "ioctl(%s) was successful.\n"
 msgstr ""
 
-#: hwclock/rtc.c:382
+#: hwclock/rtc.c:379
 #, c-format
 msgid "Open of %s failed"
 msgstr ""
 
-#: hwclock/rtc.c:400 hwclock/rtc.c:446
+#: hwclock/rtc.c:397 hwclock/rtc.c:443
 #, c-format
 msgid ""
 "To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
@@ -5517,38 +5526,38 @@ msgid ""
 "this system.\n"
 msgstr ""
 
-#: hwclock/rtc.c:405 hwclock/rtc.c:451
+#: hwclock/rtc.c:402 hwclock/rtc.c:448
 #, c-format
 msgid "Unable to open %s"
 msgstr ""
 
-#: hwclock/rtc.c:412
+#: hwclock/rtc.c:409
 #, c-format
 msgid "ioctl(RTC_EPOCH_READ) to %s failed"
 msgstr ""
 
-#: hwclock/rtc.c:418
+#: hwclock/rtc.c:415
 #, c-format
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr ""
 
-#: hwclock/rtc.c:438
+#: hwclock/rtc.c:435
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
 msgstr ""
 
-#: hwclock/rtc.c:456
+#: hwclock/rtc.c:453
 #, c-format
 msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
 msgstr ""
 
-#: hwclock/rtc.c:461
+#: hwclock/rtc.c:458
 #, c-format
 msgid ""
 "The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
 msgstr ""
 
-#: hwclock/rtc.c:464
+#: hwclock/rtc.c:461
 #, c-format
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr ""
@@ -5710,213 +5719,217 @@ msgstr ""
 msgid "Login on %s from %s denied.\n"
 msgstr ""
 
-#: login-utils/chfn.c:128 login-utils/chsh.c:114
+#: login-utils/chfn.c:133 login-utils/chsh.c:119
 #, c-format
 msgid "%s: you (user %d) don't exist.\n"
 msgstr ""
 
-#: login-utils/chfn.c:135 login-utils/chsh.c:121
+#: login-utils/chfn.c:140 login-utils/chsh.c:126
 #, c-format
 msgid "%s: user \"%s\" does not exist.\n"
 msgstr ""
 
-#: login-utils/chfn.c:140 login-utils/chsh.c:126
+#: login-utils/chfn.c:145 login-utils/chsh.c:131
 #, c-format
 msgid "%s: can only change local entries; use yp%s instead.\n"
 msgstr ""
 
-#: login-utils/chfn.c:151 login-utils/chsh.c:137
+#: login-utils/chfn.c:156 login-utils/chsh.c:142
 msgid "Unknown user context"
 msgstr ""
 
-#: login-utils/chfn.c:152
+#: login-utils/chfn.c:157
 #, c-format
 msgid "%s: %s is not authorized to change the finger info of %s\n"
 msgstr ""
 
-#: login-utils/chfn.c:159 login-utils/chsh.c:145
+#: login-utils/chfn.c:164 login-utils/chsh.c:150
 #, c-format
 msgid "%s: Can't set default context for /etc/passwd"
 msgstr ""
 
-#: login-utils/chfn.c:173
+#: login-utils/chfn.c:178
 #, c-format
 msgid "Changing finger information for %s.\n"
 msgstr ""
 
-#: login-utils/chfn.c:179 login-utils/chfn.c:183 login-utils/chfn.c:190
-#: login-utils/chfn.c:194 login-utils/chsh.c:178 login-utils/chsh.c:182
-#: login-utils/chsh.c:189 login-utils/chsh.c:193
-msgid "Password error."
+#: login-utils/chfn.c:189
+#, c-format
+msgid "chfn: PAM Failure, aborting: %s\n"
 msgstr ""
 
-#: login-utils/chfn.c:203 login-utils/chsh.c:202 login-utils/login.c:798
+#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:798
 #: login-utils/newgrp.c:85 login-utils/simpleinit.c:340 mount/lomount.c:333
 #: mount/lomount.c:336
 msgid "Password: "
 msgstr ""
 
-#: login-utils/chfn.c:206 login-utils/chsh.c:205
+#: login-utils/chfn.c:215 login-utils/chsh.c:214
 msgid "Incorrect password."
 msgstr ""
 
-#: login-utils/chfn.c:217
+#: login-utils/chfn.c:226
 #, c-format
 msgid "Finger information not changed.\n"
 msgstr ""
 
-#: login-utils/chfn.c:319
+#: login-utils/chfn.c:328
 #, c-format
 msgid "Usage: %s [ -f full-name ] [ -o office ] "
 msgstr ""
 
-#: login-utils/chfn.c:320
+#: login-utils/chfn.c:329
 #, c-format
 msgid ""
 "[ -p office-phone ]\n"
 "\t[ -h home-phone ] "
 msgstr ""
 
-#: login-utils/chfn.c:321
+#: login-utils/chfn.c:330
 #, c-format
 msgid "[ --help ] [ --version ]\n"
 msgstr ""
 
-#: login-utils/chfn.c:392 login-utils/chsh.c:312
+#: login-utils/chfn.c:401 login-utils/chsh.c:321
 #, c-format
 msgid ""
 "\n"
 "Aborted.\n"
 msgstr ""
 
-#: login-utils/chfn.c:425
+#: login-utils/chfn.c:434
 #, c-format
 msgid "field is too long.\n"
 msgstr ""
 
-#: login-utils/chfn.c:433
+#: login-utils/chfn.c:442
 #, c-format
 msgid "'%c' is not allowed.\n"
 msgstr ""
 
-#: login-utils/chfn.c:438
+#: login-utils/chfn.c:447
 #, c-format
 msgid "Control characters are not allowed.\n"
 msgstr ""
 
-#: login-utils/chfn.c:503
+#: login-utils/chfn.c:512
 #, c-format
 msgid "Finger information *NOT* changed.  Try again later.\n"
 msgstr ""
 
-#: login-utils/chfn.c:506
+#: login-utils/chfn.c:515
 #, c-format
 msgid "Finger information changed.\n"
 msgstr ""
 
-#: login-utils/chfn.c:520 login-utils/chsh.c:430 sys-utils/cytune.c:321
+#: login-utils/chfn.c:529 login-utils/chsh.c:439 sys-utils/cytune.c:321
 msgid "malloc failed"
 msgstr ""
 
-#: login-utils/chsh.c:138
+#: login-utils/chsh.c:143
 #, c-format
 msgid "%s: %s is not authorized to change the shell of %s\n"
 msgstr ""
 
-#: login-utils/chsh.c:159
+#: login-utils/chsh.c:164
 #, c-format
 msgid ""
 "%s: Running UID doesn't match UID of user we're altering, shell change "
 "denied\n"
 msgstr ""
 
-#: login-utils/chsh.c:165
+#: login-utils/chsh.c:170
 #, c-format
 msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
 msgstr ""
 
-#: login-utils/chsh.c:172
+#: login-utils/chsh.c:177
 #, c-format
 msgid "Changing shell for %s.\n"
 msgstr ""
 
-#: login-utils/chsh.c:213
+#: login-utils/chsh.c:188
+#, c-format
+msgid "chsh: PAM Failure, aborting: %s\n"
+msgstr ""
+
+#: login-utils/chsh.c:222
 msgid "New shell"
 msgstr ""
 
-#: login-utils/chsh.c:220
+#: login-utils/chsh.c:229
 #, c-format
 msgid "Shell not changed.\n"
 msgstr ""
 
-#: login-utils/chsh.c:226
+#: login-utils/chsh.c:235
 #, c-format
 msgid "Shell *NOT* changed.  Try again later.\n"
 msgstr ""
 
-#: login-utils/chsh.c:229
+#: login-utils/chsh.c:238
 #, c-format
 msgid "Shell changed.\n"
 msgstr ""
 
-#: login-utils/chsh.c:294
+#: login-utils/chsh.c:303
 #, c-format
 msgid ""
 "Usage: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
 "       [ username ]\n"
 msgstr ""
 
-#: login-utils/chsh.c:340
+#: login-utils/chsh.c:349
 #, c-format
 msgid "%s: shell must be a full path name.\n"
 msgstr ""
 
-#: login-utils/chsh.c:344
+#: login-utils/chsh.c:353
 #, c-format
 msgid "%s: \"%s\" does not exist.\n"
 msgstr ""
 
-#: login-utils/chsh.c:348
+#: login-utils/chsh.c:357
 #, c-format
 msgid "%s: \"%s\" is not executable.\n"
 msgstr ""
 
-#: login-utils/chsh.c:355
+#: login-utils/chsh.c:364
 #, c-format
 msgid "%s: '%c' is not allowed.\n"
 msgstr ""
 
-#: login-utils/chsh.c:359
+#: login-utils/chsh.c:368
 #, c-format
 msgid "%s: Control characters are not allowed.\n"
 msgstr ""
 
-#: login-utils/chsh.c:366
+#: login-utils/chsh.c:375
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells\n"
 msgstr ""
 
-#: login-utils/chsh.c:368
+#: login-utils/chsh.c:377
 #, c-format
 msgid "%s: \"%s\" is not listed in /etc/shells.\n"
 msgstr ""
 
-#: login-utils/chsh.c:370
+#: login-utils/chsh.c:379
 #, c-format
 msgid "%s: use -l option to see list\n"
 msgstr ""
 
-#: login-utils/chsh.c:376
+#: login-utils/chsh.c:385
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells.\n"
 msgstr ""
 
-#: login-utils/chsh.c:377
+#: login-utils/chsh.c:386
 #, c-format
 msgid "Use %s -l to see list.\n"
 msgstr ""
 
-#: login-utils/chsh.c:397
+#: login-utils/chsh.c:406
 #, c-format
 msgid "No known shells.\n"
 msgstr ""
@@ -6440,7 +6453,7 @@ msgstr ""
 msgid "fork failed\n"
 msgstr ""
 
-#: login-utils/simpleinit.c:539 text-utils/more.c:1635
+#: login-utils/simpleinit.c:539 text-utils/more.c:1634
 msgid "exec failed\n"
 msgstr ""
 
@@ -6581,22 +6594,27 @@ msgstr ""
 msgid "%s: can't read temporary file.\n"
 msgstr ""
 
-#: misc-utils/cal.c:347
+#: misc-utils/cal.c:346 misc-utils/cal.c:358
+#, c-format
+msgid "illegal day value: use 1-%d"
+msgstr ""
+
+#: misc-utils/cal.c:350
 msgid "illegal month value: use 1-12"
 msgstr ""
 
-#: misc-utils/cal.c:351
+#: misc-utils/cal.c:354
 msgid "illegal year value: use 1-9999"
 msgstr ""
 
-#: misc-utils/cal.c:464
+#: misc-utils/cal.c:467
 #, c-format
 msgid "%s %d"
 msgstr ""
 
-#: misc-utils/cal.c:810
+#: misc-utils/cal.c:816
 #, c-format
-msgid "usage: cal [-13smjyV] [[month] year]\n"
+msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr ""
 
 #: misc-utils/ddate.c:203
@@ -6654,7 +6672,7 @@ msgid ""
 "usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
 msgstr ""
 
-#: misc-utils/look.c:352
+#: misc-utils/look.c:351
 #, c-format
 msgid "usage: look [-dfa] [-t char] string [file]\n"
 msgstr ""
@@ -6669,52 +6687,52 @@ msgstr ""
 msgid "Got %d bytes from %s\n"
 msgstr ""
 
-#: misc-utils/namei.c:107
+#: misc-utils/namei.c:111
 #, c-format
 msgid "namei: unable to get current directory - %s\n"
 msgstr ""
 
-#: misc-utils/namei.c:121
+#: misc-utils/namei.c:125
 #, c-format
 msgid "namei: unable to chdir to %s - %s (%d)\n"
 msgstr ""
 
-#: misc-utils/namei.c:131
+#: misc-utils/namei.c:135
 #, c-format
 msgid "usage: namei [-mx] pathname [pathname ...]\n"
 msgstr ""
 
-#: misc-utils/namei.c:158
+#: misc-utils/namei.c:162
 #, c-format
 msgid "namei: could not chdir to root!\n"
 msgstr ""
 
-#: misc-utils/namei.c:165
+#: misc-utils/namei.c:169
 #, c-format
 msgid "namei: could not stat root!\n"
 msgstr ""
 
-#: misc-utils/namei.c:179
+#: misc-utils/namei.c:183
 #, c-format
 msgid "namei: buf overflow\n"
 msgstr ""
 
-#: misc-utils/namei.c:241
+#: misc-utils/namei.c:245
 #, c-format
 msgid " ? could not chdir into %s - %s (%d)\n"
 msgstr ""
 
-#: misc-utils/namei.c:269
+#: misc-utils/namei.c:273
 #, c-format
 msgid " ? problems reading symlink %s - %s (%d)\n"
 msgstr ""
 
-#: misc-utils/namei.c:279
+#: misc-utils/namei.c:283
 #, c-format
 msgid "  *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n"
 msgstr ""
 
-#: misc-utils/namei.c:317
+#: misc-utils/namei.c:328
 #, c-format
 msgid "namei: unknown file type 0%06o on file %s\n"
 msgstr ""
@@ -6734,7 +6752,7 @@ msgstr ""
 msgid "call: %s from to files...\n"
 msgstr ""
 
-#: misc-utils/script.c:109
+#: misc-utils/script.c:110
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -6742,39 +6760,39 @@ msgid ""
 "Script not started.\n"
 msgstr ""
 
-#: misc-utils/script.c:172
+#: misc-utils/script.c:173
 #, c-format
 msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
 msgstr ""
 
-#: misc-utils/script.c:195
+#: misc-utils/script.c:196
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr ""
 
-#: misc-utils/script.c:290
+#: misc-utils/script.c:296
 #, c-format
 msgid "Script started on %s"
 msgstr ""
 
-#: misc-utils/script.c:404
+#: misc-utils/script.c:410
 #, c-format
 msgid ""
 "\n"
 "Script done on %s"
 msgstr ""
 
-#: misc-utils/script.c:411
+#: misc-utils/script.c:417
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr ""
 
-#: misc-utils/script.c:422
+#: misc-utils/script.c:428
 #, c-format
 msgid "openpty failed\n"
 msgstr ""
 
-#: misc-utils/script.c:456
+#: misc-utils/script.c:462
 #, c-format
 msgid "Out of pty's\n"
 msgstr ""
@@ -7005,12 +7023,12 @@ msgstr ""
 msgid "Error writing screendump\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1180
+#: misc-utils/setterm.c:1172
 #, c-format
-msgid "couldn't read %s, and cannot ioctl dump\n"
+msgid "Couldn't read %s\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1246
+#: misc-utils/setterm.c:1223
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr ""
@@ -7020,52 +7038,52 @@ msgstr ""
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
 msgstr ""
 
-#: misc-utils/write.c:99
+#: misc-utils/write.c:98
 #, c-format
 msgid "write: can't find your tty's name\n"
 msgstr ""
 
-#: misc-utils/write.c:110
+#: misc-utils/write.c:109
 #, c-format
 msgid "write: you have write permission turned off.\n"
 msgstr ""
 
-#: misc-utils/write.c:131
+#: misc-utils/write.c:130
 #, c-format
 msgid "write: %s is not logged in on %s.\n"
 msgstr ""
 
-#: misc-utils/write.c:139
+#: misc-utils/write.c:138
 #, c-format
 msgid "write: %s has messages disabled on %s\n"
 msgstr ""
 
-#: misc-utils/write.c:146
+#: misc-utils/write.c:145
 #, c-format
 msgid "usage: write user [tty]\n"
 msgstr ""
 
-#: misc-utils/write.c:234
+#: misc-utils/write.c:233
 #, c-format
 msgid "write: %s is not logged in\n"
 msgstr ""
 
-#: misc-utils/write.c:243
+#: misc-utils/write.c:242
 #, c-format
 msgid "write: %s has messages disabled\n"
 msgstr ""
 
-#: misc-utils/write.c:247
+#: misc-utils/write.c:246
 #, c-format
 msgid "write: %s is logged in more than once; writing to %s\n"
 msgstr ""
 
-#: misc-utils/write.c:313
+#: misc-utils/write.c:312
 #, c-format
 msgid "Message from %s@%s (as %s) on %s at %s ..."
 msgstr ""
 
-#: misc-utils/write.c:316
+#: misc-utils/write.c:315
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
 msgstr ""
@@ -7136,22 +7154,27 @@ msgid ""
 "Perhaps there is a stale lock file?\n"
 msgstr ""
 
-#: mount/fstab.c:686 mount/fstab.c:739
+#: mount/fstab.c:688 mount/fstab.c:741
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr ""
 
-#: mount/fstab.c:748
+#: mount/fstab.c:750
 #, c-format
 msgid "error writing %s: %s"
 msgstr ""
 
-#: mount/fstab.c:758
+#: mount/fstab.c:768
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr ""
 
-#: mount/fstab.c:776
+#: mount/fstab.c:781
+#, c-format
+msgid "error changing owner of %s: %s\n"
+msgstr ""
+
+#: mount/fstab.c:792
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr ""
@@ -7300,7 +7323,7 @@ msgstr ""
 msgid "mount: can't open %s for writing: %s"
 msgstr ""
 
-#: mount/mount.c:552 mount/mount.c:950
+#: mount/mount.c:552 mount/mount.c:957
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr ""
@@ -7310,308 +7333,318 @@ msgstr ""
 msgid "mount: error changing mode of %s: %s"
 msgstr ""
 
-#: mount/mount.c:676 mount/mount.c:1565
+#: mount/mount.c:641
+#, c-format
+msgid "mount: cannot set group id: %s"
+msgstr ""
+
+#: mount/mount.c:644
+#, c-format
+msgid "mount: cannot set user id: %s"
+msgstr ""
+
+#: mount/mount.c:683 mount/mount.c:1572
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr ""
 
-#: mount/mount.c:690
+#: mount/mount.c:697
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
 msgstr ""
 
-#: mount/mount.c:693
+#: mount/mount.c:700
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
 msgstr ""
 
-#: mount/mount.c:696
+#: mount/mount.c:703
 #, c-format
 msgid "       and it looks like this is swapspace\n"
 msgstr ""
 
-#: mount/mount.c:698
+#: mount/mount.c:705
 #, c-format
 msgid "       I will try type %s\n"
 msgstr ""
 
-#: mount/mount.c:725
+#: mount/mount.c:732
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr ""
 
-#: mount/mount.c:816
+#: mount/mount.c:823
 msgid "mount failed"
 msgstr ""
 
-#: mount/mount.c:818
+#: mount/mount.c:825
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr ""
 
-#: mount/mount.c:846
+#: mount/mount.c:853
 msgid "mount: loop device specified twice"
 msgstr ""
 
-#: mount/mount.c:851
+#: mount/mount.c:858
 msgid "mount: type specified twice"
 msgstr ""
 
-#: mount/mount.c:863
+#: mount/mount.c:870
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr ""
 
-#: mount/mount.c:876
+#: mount/mount.c:883
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr ""
 
-#: mount/mount.c:885
+#: mount/mount.c:892
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr ""
 
-#: mount/mount.c:890
+#: mount/mount.c:897
 #, c-format
 msgid "mount: stolen loop=%s"
 msgstr ""
 
-#: mount/mount.c:895
+#: mount/mount.c:902
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr ""
 
-#: mount/mount.c:906
+#: mount/mount.c:913
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr ""
 
-#: mount/mount.c:945
+#: mount/mount.c:952
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr ""
 
-#: mount/mount.c:966
+#: mount/mount.c:973
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr ""
 
-#: mount/mount.c:979
+#: mount/mount.c:986
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr ""
 
-#: mount/mount.c:982
+#: mount/mount.c:989
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr ""
 
-#: mount/mount.c:1040
+#: mount/mount.c:1047
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr ""
 
-#: mount/mount.c:1115
+#: mount/mount.c:1122
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
 
-#: mount/mount.c:1118
+#: mount/mount.c:1125
 msgid "mount: you must specify the filesystem type"
 msgstr ""
 
-#: mount/mount.c:1121
+#: mount/mount.c:1128
 msgid "mount: mount failed"
 msgstr ""
 
-#: mount/mount.c:1127 mount/mount.c:1162
+#: mount/mount.c:1134 mount/mount.c:1169
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr ""
 
-#: mount/mount.c:1129
+#: mount/mount.c:1136
 msgid "mount: permission denied"
 msgstr ""
 
-#: mount/mount.c:1131
+#: mount/mount.c:1138
 msgid "mount: must be superuser to use mount"
 msgstr ""
 
-#: mount/mount.c:1135 mount/mount.c:1139
+#: mount/mount.c:1142 mount/mount.c:1146
 #, c-format
 msgid "mount: %s is busy"
 msgstr ""
 
-#: mount/mount.c:1141
+#: mount/mount.c:1148
 msgid "mount: proc already mounted"
 msgstr ""
 
-#: mount/mount.c:1143
+#: mount/mount.c:1150
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr ""
 
-#: mount/mount.c:1149
+#: mount/mount.c:1156
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr ""
 
-#: mount/mount.c:1151
+#: mount/mount.c:1158
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr ""
 
-#: mount/mount.c:1154
+#: mount/mount.c:1161
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr ""
 
-#: mount/mount.c:1164
+#: mount/mount.c:1171
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
 "       (a path prefix is not a directory)\n"
 msgstr ""
 
-#: mount/mount.c:1177
+#: mount/mount.c:1184
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr ""
 
-#: mount/mount.c:1179
+#: mount/mount.c:1186
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
-"       missing codepage or other error"
+"       missing codepage or helper program, or other error"
 msgstr ""
 
-#: mount/mount.c:1189
+#: mount/mount.c:1196
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
 msgstr ""
 
-#: mount/mount.c:1195
+#: mount/mount.c:1202
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
 msgstr ""
 
-#: mount/mount.c:1212
+#: mount/mount.c:1219
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
 msgstr ""
 
-#: mount/mount.c:1218
+#: mount/mount.c:1225
 msgid "mount table full"
 msgstr ""
 
-#: mount/mount.c:1220
+#: mount/mount.c:1227
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr ""
 
-#: mount/mount.c:1226
+#: mount/mount.c:1233
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr ""
 
-#: mount/mount.c:1231
+#: mount/mount.c:1238
 #, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr ""
 
-#: mount/mount.c:1243
+#: mount/mount.c:1250
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr ""
 
-#: mount/mount.c:1246
+#: mount/mount.c:1253
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr ""
 
-#: mount/mount.c:1249
+#: mount/mount.c:1256
 msgid "mount: maybe you meant 'vfat'?"
 msgstr ""
 
-#: mount/mount.c:1252
+#: mount/mount.c:1259
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 
-#: mount/mount.c:1258
+#: mount/mount.c:1265
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr ""
 
-#: mount/mount.c:1260
+#: mount/mount.c:1267
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
 "       (maybe `insmod driver'?)"
 msgstr ""
 
-#: mount/mount.c:1263
+#: mount/mount.c:1270
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr ""
 
-#: mount/mount.c:1266
+#: mount/mount.c:1273
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr ""
 
-#: mount/mount.c:1269
+#: mount/mount.c:1276
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr ""
 
-#: mount/mount.c:1272
+#: mount/mount.c:1279
 msgid "block device "
 msgstr ""
 
-#: mount/mount.c:1274
+#: mount/mount.c:1281
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr ""
 
-#: mount/mount.c:1278
+#: mount/mount.c:1285
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
 
-#: mount/mount.c:1293
+#: mount/mount.c:1300
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr ""
 
-#: mount/mount.c:1393
+#: mount/mount.c:1400
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 
-#: mount/mount.c:1399
+#: mount/mount.c:1406
 #, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr ""
 
-#: mount/mount.c:1416
+#: mount/mount.c:1423
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr ""
 
-#: mount/mount.c:1426
+#: mount/mount.c:1433
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr ""
 
-#: mount/mount.c:1512
+#: mount/mount.c:1519
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr ""
 
-#: mount/mount.c:1650
+#: mount/mount.c:1657
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -7648,24 +7681,24 @@ msgid ""
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 
-#: mount/mount.c:1960
+#: mount/mount.c:1967
 msgid "mount: only root can do that"
 msgstr ""
 
-#: mount/mount.c:1965
+#: mount/mount.c:1972
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr ""
 
-#: mount/mount.c:1975
+#: mount/mount.c:1982
 msgid "nothing was mounted"
 msgstr ""
 
-#: mount/mount.c:1988 mount/mount.c:2014
+#: mount/mount.c:1995 mount/mount.c:2021
 msgid "mount: no such partition found"
 msgstr ""
 
-#: mount/mount.c:1991
+#: mount/mount.c:1998
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr ""
@@ -7705,42 +7738,47 @@ msgid ""
 "       %s [-v] special ...\n"
 msgstr ""
 
-#: mount/swapon.c:128
+#: mount/swapon.c:103
+#, c-format
+msgid "%s: %s: unexpected file format\n"
+msgstr ""
+
+#: mount/swapon.c:132
 #, c-format
 msgid "%s: cannot canonicalize %s: %s\n"
 msgstr ""
 
-#: mount/swapon.c:167 mount/swapon.c:255
+#: mount/swapon.c:171 mount/swapon.c:259
 #, c-format
 msgid "%s on %s\n"
 msgstr ""
 
-#: mount/swapon.c:177
+#: mount/swapon.c:181
 #, c-format
 msgid "%s: cannot stat %s: %s\n"
 msgstr ""
 
-#: mount/swapon.c:188
+#: mount/swapon.c:192
 #, c-format
 msgid "%s: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr ""
 
-#: mount/swapon.c:200
+#: mount/swapon.c:204
 #, c-format
 msgid "%s: Skipping file %s - it appears to have holes.\n"
 msgstr ""
 
-#: mount/swapon.c:233
+#: mount/swapon.c:237
 #, c-format
 msgid "%s: cannot find the device for %s\n"
 msgstr ""
 
-#: mount/swapon.c:267
+#: mount/swapon.c:271
 #, c-format
 msgid "Not superuser.\n"
 msgstr ""
 
-#: mount/swapon.c:301 mount/swapon.c:492
+#: mount/swapon.c:305 mount/swapon.c:496
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr ""
@@ -7750,81 +7788,91 @@ msgstr ""
 msgid "umount: compiled without support for -f\n"
 msgstr ""
 
-#: mount/umount.c:130
+#: mount/umount.c:109
+#, c-format
+msgid "umount: cannot set group id: %s"
+msgstr ""
+
+#: mount/umount.c:112
+#, c-format
+msgid "umount: cannot set user id: %s"
+msgstr ""
+
+#: mount/umount.c:137
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr ""
 
-#: mount/umount.c:142
+#: mount/umount.c:149
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr ""
 
-#: mount/umount.c:144
+#: mount/umount.c:151
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr ""
 
-#: mount/umount.c:146
+#: mount/umount.c:153
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr ""
 
-#: mount/umount.c:150
+#: mount/umount.c:157
 #, c-format
 msgid "umount: %s: device is busy"
 msgstr ""
 
-#: mount/umount.c:152
+#: mount/umount.c:159
 #, c-format
 msgid "umount: %s: not found"
 msgstr ""
 
-#: mount/umount.c:154
+#: mount/umount.c:161
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr ""
 
-#: mount/umount.c:156
+#: mount/umount.c:163
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr ""
 
-#: mount/umount.c:158
+#: mount/umount.c:165
 #, c-format
 msgid "umount: %s: %s"
 msgstr ""
 
-#: mount/umount.c:207
+#: mount/umount.c:214
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr ""
 
-#: mount/umount.c:223
+#: mount/umount.c:230
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr ""
 
-#: mount/umount.c:241
+#: mount/umount.c:248
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr ""
 
-#: mount/umount.c:252
+#: mount/umount.c:259
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr ""
 
-#: mount/umount.c:261
+#: mount/umount.c:268
 #, c-format
 msgid "%s umounted\n"
 msgstr ""
 
-#: mount/umount.c:359
+#: mount/umount.c:366
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 
-#: mount/umount.c:389
+#: mount/umount.c:396
 #, c-format
 msgid ""
 "Usage: umount [-hV]\n"
@@ -7832,46 +7880,46 @@ msgid ""
 "       umount [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 
-#: mount/umount.c:441
+#: mount/umount.c:448
 msgid "Cannot umount \"\"\n"
 msgstr ""
 
-#: mount/umount.c:447
+#: mount/umount.c:454
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr ""
 
-#: mount/umount.c:453
+#: mount/umount.c:460
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr ""
 
-#: mount/umount.c:460
+#: mount/umount.c:467
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr ""
 
-#: mount/umount.c:484
+#: mount/umount.c:491
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr ""
 
-#: mount/umount.c:497
+#: mount/umount.c:504
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr ""
 
-#: mount/umount.c:501
+#: mount/umount.c:508
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr ""
 
-#: mount/umount.c:542
+#: mount/umount.c:549
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr ""
 
-#: mount/umount.c:623
+#: mount/umount.c:630
 msgid "umount: only root can do that"
 msgstr ""
 
@@ -8843,7 +8891,12 @@ msgstr ""
 
 #: sys-utils/rtcwake.c:380
 #, c-format
-msgid "Using %s time\n"
+msgid "Using UTC time.\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:381
+#, c-format
+msgid "Using local time.\n"
 msgstr ""
 
 #: sys-utils/rtcwake.c:385
@@ -8883,7 +8936,12 @@ msgstr ""
 msgid "disable rtc alarm interrupt"
 msgstr ""
 
-#: sys-utils/setarch.c:70
+#: sys-utils/setarch.c:50
+#, c-format
+msgid "Switching on %s.\n"
+msgstr ""
+
+#: sys-utils/setarch.c:81
 #, c-format
 msgid ""
 "Usage: %s%s [options] [program [program arguments]]\n"
@@ -8891,45 +8949,49 @@ msgid ""
 "Options:\n"
 msgstr ""
 
-#: sys-utils/setarch.c:74
+#: sys-utils/setarch.c:85
 #, c-format
-msgid "\t-%c\tEnable %s\n"
+msgid ""
+" -h, --help               this help\n"
+" -v, --verbose            verbose mode\n"
+" -R, --addr-no-randomize  disables randomization of the virtual address "
+"space\n"
+" -F, --fdpic-funcptrs     turns on function pointers point to descriptors\n"
+" -Z, --mmap-page-zero     turns on MMAP_PAGE_ZERO\n"
+" -L, --addr-compat-layout changes the way virtual memory is allocated\n"
+" -X, --read-implies-exec  turns on READ_IMPLIES_EXEC\n"
+" -B, --32bit              turns on ADDR_LIMIT_32BIT\n"
+" -I, --short-inode        turns on SHORT_INODE\n"
+" -S, --whole-seconds      turns on WHOLE_SECONDS\n"
+" -T, --sticky-timeouts    turns on STICKY_TIMEOUTS\n"
+" -3, --3gb                turns on maximum of 3GB of address space\n"
+"     --4gb                ignored (for backward compatibility only\n"
 msgstr ""
 
-#: sys-utils/setarch.c:76
+#: sys-utils/setarch.c:99
 #, c-format
 msgid ""
 "\n"
 "For more information see setarch(8).\n"
 msgstr ""
 
-#: sys-utils/setarch.c:88
+#: sys-utils/setarch.c:111
 #, c-format
 msgid ""
 "%s: %s\n"
 "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: sys-utils/setarch.c:155 sys-utils/setarch.c:171
+#: sys-utils/setarch.c:179 sys-utils/setarch.c:195
 #, c-format
 msgid "%s: Unrecognized architecture"
 msgstr ""
 
-#: sys-utils/setarch.c:188 sys-utils/setarch.c:195
+#: sys-utils/setarch.c:213 sys-utils/setarch.c:220
 msgid "Not enough arguments"
 msgstr ""
 
-#: sys-utils/setarch.c:237
-#, c-format
-msgid "Switching on %s.\n"
-msgstr ""
-
-#: sys-utils/setarch.c:244
-#, c-format
-msgid "Unknown option `%c' ignored"
-msgstr ""
-
-#: sys-utils/setarch.c:249
+#: sys-utils/setarch.c:282
 #, c-format
 msgid "Failed to set personality to %s"
 msgstr ""
@@ -9063,17 +9125,17 @@ msgid ""
 "hexdump: [-bcCdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
 msgstr ""
 
-#: text-utils/more.c:258
+#: text-utils/more.c:257
 #, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
 msgstr ""
 
-#: text-utils/more.c:481
+#: text-utils/more.c:480
 #, c-format
 msgid "%s: unknown option \"-%c\"\n"
 msgstr ""
 
-#: text-utils/more.c:513
+#: text-utils/more.c:512
 #, c-format
 msgid ""
 "\n"
@@ -9081,7 +9143,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: text-utils/more.c:557
+#: text-utils/more.c:556
 #, c-format
 msgid ""
 "\n"
@@ -9089,52 +9151,52 @@ msgid ""
 "\n"
 msgstr ""
 
-#: text-utils/more.c:660
+#: text-utils/more.c:659
 #, c-format
 msgid "[Use q or Q to quit]"
 msgstr ""
 
-#: text-utils/more.c:752
+#: text-utils/more.c:751
 #, c-format
 msgid "--More--"
 msgstr ""
 
-#: text-utils/more.c:754
+#: text-utils/more.c:753
 #, c-format
 msgid "(Next file: %s)"
 msgstr ""
 
-#: text-utils/more.c:759
+#: text-utils/more.c:758
 #, c-format
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr ""
 
-#: text-utils/more.c:1174
+#: text-utils/more.c:1173
 #, c-format
 msgid "...back %d pages"
 msgstr ""
 
-#: text-utils/more.c:1176
+#: text-utils/more.c:1175
 msgid "...back 1 page"
 msgstr ""
 
-#: text-utils/more.c:1219
+#: text-utils/more.c:1218
 msgid "...skipping one line"
 msgstr ""
 
-#: text-utils/more.c:1221
+#: text-utils/more.c:1220
 #, c-format
 msgid "...skipping %d lines"
 msgstr ""
 
-#: text-utils/more.c:1258
+#: text-utils/more.c:1257
 msgid ""
 "\n"
 "***Back***\n"
 "\n"
 msgstr ""
 
-#: text-utils/more.c:1296
+#: text-utils/more.c:1295
 msgid ""
 "\n"
 "Most commands optionally preceded by integer argument k.  Defaults in "
@@ -9142,7 +9204,7 @@ msgid ""
 "Star (*) indicates argument becomes new default.\n"
 msgstr ""
 
-#: text-utils/more.c:1303
+#: text-utils/more.c:1302
 msgid ""
 "<space>                 Display next k lines of text [current screen size]\n"
 "z                       Display next k lines of text [current screen size]*\n"
@@ -9165,66 +9227,66 @@ msgid ""
 ".                       Repeat previous command\n"
 msgstr ""
 
-#: text-utils/more.c:1372 text-utils/more.c:1377
+#: text-utils/more.c:1371 text-utils/more.c:1376
 #, c-format
 msgid "[Press 'h' for instructions.]"
 msgstr ""
 
-#: text-utils/more.c:1411
+#: text-utils/more.c:1410
 #, c-format
 msgid "\"%s\" line %d"
 msgstr ""
 
-#: text-utils/more.c:1413
+#: text-utils/more.c:1412
 #, c-format
 msgid "[Not a file] line %d"
 msgstr ""
 
-#: text-utils/more.c:1497
+#: text-utils/more.c:1496
 msgid "  Overflow\n"
 msgstr ""
 
-#: text-utils/more.c:1544
+#: text-utils/more.c:1543
 msgid "...skipping\n"
 msgstr ""
 
-#: text-utils/more.c:1573
+#: text-utils/more.c:1572
 msgid "Regular expression botch"
 msgstr ""
 
-#: text-utils/more.c:1585
+#: text-utils/more.c:1584
 msgid ""
 "\n"
 "Pattern not found\n"
 msgstr ""
 
-#: text-utils/more.c:1588 text-utils/pg.c:1125 text-utils/pg.c:1276
+#: text-utils/more.c:1587 text-utils/pg.c:1123 text-utils/pg.c:1274
 msgid "Pattern not found"
 msgstr ""
 
-#: text-utils/more.c:1649
+#: text-utils/more.c:1648
 msgid "can't fork\n"
 msgstr ""
 
-#: text-utils/more.c:1688
+#: text-utils/more.c:1687
 msgid ""
 "\n"
 "...Skipping "
 msgstr ""
 
-#: text-utils/more.c:1692
+#: text-utils/more.c:1691
 msgid "...Skipping to file "
 msgstr ""
 
-#: text-utils/more.c:1694
+#: text-utils/more.c:1693
 msgid "...Skipping back to file "
 msgstr ""
 
-#: text-utils/more.c:1972
+#: text-utils/more.c:1971
 msgid "Line too long"
 msgstr ""
 
-#: text-utils/more.c:2015
+#: text-utils/more.c:2014
 msgid "No previous command to substitute for"
 msgstr ""
 
@@ -9277,87 +9339,87 @@ msgstr ""
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr ""
 
-#: text-utils/pg.c:237
+#: text-utils/pg.c:235
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr ""
 
-#: text-utils/pg.c:246
+#: text-utils/pg.c:244
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr ""
 
-#: text-utils/pg.c:254
+#: text-utils/pg.c:252
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr ""
 
-#: text-utils/pg.c:371
+#: text-utils/pg.c:369
 msgid "...skipping forward\n"
 msgstr ""
 
-#: text-utils/pg.c:373
+#: text-utils/pg.c:371
 msgid "...skipping backward\n"
 msgstr ""
 
-#: text-utils/pg.c:395
+#: text-utils/pg.c:393
 msgid "No next file"
 msgstr ""
 
-#: text-utils/pg.c:399
+#: text-utils/pg.c:397
 msgid "No previous file"
 msgstr ""
 
-#: text-utils/pg.c:929
+#: text-utils/pg.c:927
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr ""
 
-#: text-utils/pg.c:935
+#: text-utils/pg.c:933
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr ""
 
-#: text-utils/pg.c:938
+#: text-utils/pg.c:936
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr ""
 
-#: text-utils/pg.c:1033
+#: text-utils/pg.c:1031
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr ""
 
-#: text-utils/pg.c:1042 text-utils/pg.c:1217
+#: text-utils/pg.c:1040 text-utils/pg.c:1215
 msgid "RE error: "
 msgstr ""
 
-#: text-utils/pg.c:1199
+#: text-utils/pg.c:1197
 msgid "(EOF)"
 msgstr ""
 
-#: text-utils/pg.c:1225
+#: text-utils/pg.c:1223
 msgid "No remembered search string"
 msgstr ""
 
-#: text-utils/pg.c:1308
+#: text-utils/pg.c:1306
 msgid "Cannot open "
 msgstr ""
 
-#: text-utils/pg.c:1356
+#: text-utils/pg.c:1354
 msgid "saved"
 msgstr ""
 
-#: text-utils/pg.c:1463
+#: text-utils/pg.c:1461
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ""
 
-#: text-utils/pg.c:1495
+#: text-utils/pg.c:1493
 msgid "fork() failed, try again later\n"
 msgstr ""
 
-#: text-utils/pg.c:1700
+#: text-utils/pg.c:1698
 msgid "(Next file: "
 msgstr ""
 
@@ -9371,14 +9433,27 @@ msgstr ""
 msgid "usage: rev [file ...]\n"
 msgstr ""
 
-#: text-utils/tailf.c:53 text-utils/tailf.c:105
+#: text-utils/tailf.c:59 text-utils/tailf.c:129
+#, c-format
+msgid "Cannot open \"%s\" for read: %s\n"
+msgstr ""
+
+#: text-utils/tailf.c:107 text-utils/tailf.c:111
+msgid "Invalid number of lines"
+msgstr ""
+
+#: text-utils/tailf.c:114
+msgid "Invalid option"
+msgstr ""
+
+#: text-utils/tailf.c:118
 #, c-format
-msgid "Cannot open \"%s\" for read\n"
+msgid "Usage: tailf [-n N | -N] logfile\n"
 msgstr ""
 
-#: text-utils/tailf.c:93
+#: text-utils/tailf.c:137
 #, c-format
-msgid "Usage: tailf logfile\n"
+msgid "Incomplete write to \"%s\" (written %d, expected %d)\n"
 msgstr ""
 
 #: text-utils/ul.c:141